Update to 1.7

2 files changed, 12 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e76c211f1057..eacaf1dbbec4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = r-markdown
 	pkgdesc = Render Markdown with 'commonmark'
-	pkgver = 1.6
+	pkgver = 1.7
 	pkgrel = 1
 	url = https://cran.r-project.org/package=markdown
 	arch = any
-	license = GPL2
+	license = MIT
 	depends = r-commonmark
 	depends = r-xfun
 	optdepends = r-knitr
 	optdepends = r-rmarkdown
 	optdepends = r-yaml
 	optdepends = r-rcurl
-	source = https://cran.r-project.org/src/contrib/markdown_1.6.tar.gz
-	sha256sums = 46228b8d8161ae4b651b4662364eb35a3b91e6a7a457fe99d0e709f2a6f559ea
+	source = https://cran.r-project.org/src/contrib/markdown_1.7.tar.gz
+	sha256sums = cb2b9a4752174406b3b3557b0da943ab37041e6b1d993281d59614bb2acdcfb1
 
 pkgname = r-markdown
diff --git a/PKGBUILD b/PKGBUILD
index c04b1c88fcce..33e7180e9a38 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,14 @@
 # Contributor: Alex Branham <branham@utexas.edu>
 
 _cranname=markdown
-_cranver=1.6
+_cranver=1.7
 pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
 pkgrel=1
 pkgdesc="Render Markdown with 'commonmark'"
 arch=(any)
 url="https://cran.r-project.org/package=${_cranname}"
-license=(GPL2)
+license=(MIT)
 depends=(r-commonmark r-xfun)
 optdepends=(
     r-knitr
@@ -20,15 +20,17 @@ optdepends=(
     r-rcurl
 )
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('46228b8d8161ae4b651b4662364eb35a3b91e6a7a457fe99d0e709f2a6f559ea')
+sha256sums=('cb2b9a4752174406b3b3557b0da943ab37041e6b1d993281d59614bb2acdcfb1')
 
 build() {
   mkdir -p build
-  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+  R CMD INSTALL "$_cranname" -l build
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_cranname" "$pkgdir/usr/lib/R/library"
 
-  cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s "/usr/lib/R/library/$_cranname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
 }