Upkg 1.6

2 files changed, 12 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 58470e4c7376..d488d0e30b27 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = r-commonmark
 	pkgdesc = High Performance CommonMark and Github Markdown Rendering in R
-	pkgver = 1.5
+	pkgver = 1.6
 	pkgrel = 1
 	url = https://cran.r-project.org/package=commonmark
 	arch = x86_64
 	license = BSD_2_clause + file LICENSE
 	depends = r
 	optdepends = r-curl
-	source = https://cran.r-project.org/src/contrib/commonmark_1.5.tar.gz
-	md5sums = 61cd4dabb77e59c7994fd73407936013
+	source = https://cran.r-project.org/src/contrib/commonmark_1.6.tar.gz
+	md5sums = a593fa53ddc7194b0053e1a11fec73d9
 
 pkgname = r-commonmark
 
diff --git a/PKGBUILD b/PKGBUILD
index da28dd8b6c8d..d4ceb2fee616 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,22 @@
-# Maintainer: Alex Branham <branham@utexas.edu>
-_cranname=commonmark
-_cranver=1.5
-_pkgtar=${_cranname}_${_cranver}.tar.gz
+# Maintainer: Alex Branham <alex.branham@gmail.com>
+_cranver=1.6
 pkgname=r-commonmark
 pkgver=${_cranver//[:-]/.}
 pkgrel=1
-pkgdesc="High Performance CommonMark and Github Markdown Rendering in R"
+pkgdesc='High Performance CommonMark and Github Markdown Rendering in R'
 arch=('x86_64')
-url="https://cran.r-project.org/package=${_cranname}"
+url='https://cran.r-project.org/package=commonmark'
 license=('BSD_2_clause + file LICENSE')
 depends=('r' )
-
 optdepends=('r-curl')
-
-source=("https://cran.r-project.org/src/contrib/${_pkgtar}")
-md5sums=('61cd4dabb77e59c7994fd73407936013')
+source=("https://cran.r-project.org/src/contrib/commonmark_"$_cranver".tar.gz")
+md5sums=('a593fa53ddc7194b0053e1a11fec73d9')
 
 build(){
-    R CMD INSTALL ${_pkgtar} -l $srcdir
+    R CMD INSTALL commonmark_"$_cranver".tar.gz -l "$srcdir"
 }
 package() {
-    install -d "$pkgdir/usr/lib/R/library"
-    cp -r "$srcdir/$_cranname" "$pkgdir/usr/lib/R/library"
+    install -dm0755 "$pkgdir"/usr/lib/R/library
+    cp -a --no-preserve=ownership commonmark "$pkgdir"/usr/lib/R/library
 }