[lilac] updated to 1.6.2-2

2 files changed, 39 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3532689d1843..4da94e2b913e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,24 @@
 pkgbase = r-fs
 	pkgdesc = Cross-Platform File System Operations Based on 'libuv'
 	pkgver = 1.6.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cran.r-project.org/package=fs
-	arch = i686
 	arch = x86_64
 	license = MIT
-	depends = r
 	depends = libuv
-	optdepends = r-testthat
+	depends = r
 	optdepends = r-covr
-	optdepends = r-pillar
-	optdepends = r-tibble
 	optdepends = r-crayon
-	optdepends = r-rmarkdown
 	optdepends = r-knitr
-	optdepends = r-withr
+	optdepends = r-pillar
+	optdepends = r-rmarkdown
 	optdepends = r-spelling
+	optdepends = r-testthat
+	optdepends = r-tibble
 	optdepends = r-vctrs
+	optdepends = r-withr
 	source = https://cran.r-project.org/src/contrib/fs_1.6.2.tar.gz
-	source = CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
+	md5sums = 3827672b1f4747ce6bd3a224a74a9f61
 	sha256sums = 548b7c0ed5ab26dc4fbd88707ae12987bcaef834dbc6de4e17d453846dc436b2
-	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-fs
diff --git a/PKGBUILD b/PKGBUILD
index b6a9f240864f..f109748aa7c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,54 @@
 # Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 # Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Alex Branham <alex.branham@gmail.com>
 
-_cranname=fs
-_cranver=1.6.2
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=fs
+_pkgver=1.6.2
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//[:-]/.}
+pkgrel=2
 pkgdesc="Cross-Platform File System Operations Based on 'libuv'"
-arch=(i686 x86_64)
-url="https://cran.r-project.org/package=${_cranname}"
+arch=(x86_64)
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(MIT)
-depends=(r libuv)
+depends=(
+  libuv
+  r
+)
 optdepends=(
-    r-testthat
-    r-covr
-    r-pillar
-    r-tibble
-    r-crayon
-    r-rmarkdown
-    r-knitr
-    r-withr
-    r-spelling
-    r-vctrs
+  r-covr
+  r-crayon
+  r-knitr
+  r-pillar
+  r-rmarkdown
+  r-spelling
+  r-testthat
+  r-tibble
+  r-vctrs
+  r-withr
 )
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
-        "CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT")
-sha256sums=('548b7c0ed5ab26dc4fbd88707ae12987bcaef834dbc6de4e17d453846dc436b2'
-            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('3827672b1f4747ce6bd3a224a74a9f61')
+sha256sums=('548b7c0ed5ab26dc4fbd88707ae12987bcaef834dbc6de4e17d453846dc436b2')
 
 prepare() {
   # build against system libuv
   sed -e 's#PKG_LIBS = ./$(LIBUV)/.libs/libuv.a#PKG_LIBS = -luv#' \
       -e 's#-I./$(LIBUV)/include ##' \
       -e '/$(SHLIB):/d' \
-      -i "${_cranname}/src/Makevars"
+      -i "$_pkgname/src/Makevars"
 }
 
 build() {
   mkdir -p build
-  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+  R CMD INSTALL "$_pkgname" -l build
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
-
-  cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
 
-  install -Dm644 CRAN-MIT-TEMPLATE "${pkgdir}/usr/share/licenses/${pkgname}/MIT"
-  install -Dm644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s "/usr/lib/R/library/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
 }