Update to 1.6.10

2 files changed, 13 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fea031b01319..c691b72b011b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = r-httpuv
 	pkgdesc = HTTP and WebSocket Server Library
-	pkgver = 1.6.9
+	pkgver = 1.6.10
 	pkgrel = 1
 	url = https://cran.r-project.org/package=httpuv
 	arch = i686
@@ -19,7 +19,7 @@ pkgbase = r-httpuv
 	optdepends = r-callr
 	optdepends = r-curl
 	optdepends = r-websocket
-	source = https://cran.r-project.org/src/contrib/httpuv_1.6.9.tar.gz
-	sha256sums = 8d77f25b22fa7473b45007c2048e9a38d3792d59b2716e1fcdf9e99bd585d95d
+	source = https://cran.r-project.org/src/contrib/httpuv_1.6.10.tar.gz
+	sha256sums = cd290fa9565a8a791d1ed4f4f08f0060e9fb5250bba9512646e7fd57224febf0
 
 pkgname = r-httpuv
diff --git a/PKGBUILD b/PKGBUILD
index 909d79135b56..08f996547b15 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 
 _cranname=httpuv
-_cranver=1.6.9
+_cranver=1.6.10
 pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
 pkgrel=1
@@ -26,30 +26,30 @@ optdepends=(
     r-websocket
 )
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('8d77f25b22fa7473b45007c2048e9a38d3792d59b2716e1fcdf9e99bd585d95d')
+sha256sums=('cd290fa9565a8a791d1ed4f4f08f0060e9fb5250bba9512646e7fd57224febf0')
 
 prepare() {
   # build against system libuv
   sed -i -e 's|PKG_LIBS = ./libuv/.libs/libuv.a|PKG_LIBS = -luv|' \
       -e 's|-Ilibuv/include ||' \
       -e 's|$(SHLIB): libuv/.libs/libuv.a|$(SHLIB):|' \
-      "${_cranname}/src/Makevars"
+      "$_cranname/src/Makevars"
 }
 
 build() {
   mkdir -p build
-  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+  R CMD INSTALL "$_cranname" -l build
 }
 
 check() {
-  cd "${_cranname}/tests"
-  R_LIBS="${srcdir}/build" LC_TIME=C NOT_CRAN=true Rscript --vanilla testthat.R
+  cd "$_cranname/tests"
+  R_LIBS="$srcdir/build" LC_TIME=C NOT_CRAN=true Rscript --vanilla testthat.R
 }
 
 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 -Dm644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s "/usr/lib/R/library/$_cranname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
 }