[lilac] updated to 1.2.0-4

2 files changed, 39 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 258c901a7a8c..fbf2bc6ca197 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = r-tidyselect
 	pkgdesc = Select from a Set of Strings
 	pkgver = 1.2.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://cran.r-project.org/package=tidyselect
 	arch = any
 	license = MIT
@@ -23,8 +23,7 @@ pkgbase = r-tidyselect
 	optdepends = r-testthat
 	optdepends = r-tibble
 	source = https://cran.r-project.org/src/contrib/tidyselect_1.2.0.tar.gz
-	source = CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
+	md5sums = 147069ee8d8bc42f63f253311f6c1806
 	sha256sums = 538d26b727e37d618e2efd3b00836048f103112a03e6994bf07a02392e269e3b
-	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-tidyselect
diff --git a/PKGBUILD b/PKGBUILD
index c82313c765ec..c74fe6bb31c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,46 @@
 # 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: frichtlm <frichtlm@gmail.com>
 
-_cranname=tidyselect
-_cranver=1.2.0
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=3
+_pkgname=tidyselect
+_pkgver=1.2.0
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
+pkgrel=4
 pkgdesc="Select from a Set of Strings"
 arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(MIT)
 depends=(
-    r-cli
-    r-glue
-    r-lifecycle
-    r-rlang
-    r-vctrs
-    r-withr
+  r-cli
+  r-glue
+  r-lifecycle
+  r-rlang
+  r-vctrs
+  r-withr
+)
+checkdepends=(
+  r-stringr
+  r-testthat
 )
-checkdepends=(r-stringr r-testthat)
 optdepends=(
-    r-covr
-    r-crayon
-    r-dplyr
-    r-knitr
-    r-magrittr
-    r-rmarkdown
-    r-stringr
-    r-testthat
-    r-tibble
+  r-covr
+  r-crayon
+  r-dplyr
+  r-knitr
+  r-magrittr
+  r-rmarkdown
+  r-stringr
+  r-testthat
+  r-tibble
 )
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
-        "CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT")
-sha256sums=('538d26b727e37d618e2efd3b00836048f103112a03e6994bf07a02392e269e3b'
-            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('147069ee8d8bc42f63f253311f6c1806')
+sha256sums=('538d26b727e37d618e2efd3b00836048f103112a03e6994bf07a02392e269e3b')
 
 prepare() {
-  cd "${_cranname}/tests/testthat"
+  cd "$_pkgname/tests/testthat"
 
   # skip outdated snapshot tests
   sed -i '/"eval_select() produces correct backtraces"/a\ \ skip("outdated snapshot")' \
@@ -57,19 +60,18 @@ prepare() {
 
 build() {
   mkdir -p build
-  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+  R CMD INSTALL "$_pkgname" -l build
 }
 
 check() {
-  cd "${_cranname}/tests"
-  R_LIBS="${srcdir}/build" NOT_CRAN=true Rscript --vanilla testthat.R
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R
 }
 
 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"
 }