[lilac] updated to 1.0.3-7

2 files changed, 17 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 09e228100c39..e76c5670231e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 pkgbase = r-lifecycle
 	pkgdesc = Manage the Life Cycle of your Package Functions
 	pkgver = 1.0.3
-	pkgrel = 5
+	pkgrel = 7
 	url = https://cran.r-project.org/package=lifecycle
 	arch = any
 	license = MIT
-	depends = r
 	depends = r-cli
 	depends = r-glue
 	depends = r-rlang
@@ -17,10 +16,10 @@ pkgbase = r-lifecycle
 	optdepends = r-testthat
 	optdepends = r-tibble
 	optdepends = r-tidyverse
-	optdepends = r-tools
 	optdepends = r-vctrs
 	optdepends = r-withr
 	source = https://cran.r-project.org/src/contrib/lifecycle_1.0.3.tar.gz
+	md5sums = 023bff9f9b99ca56ed01b705a41a8bed
 	sha256sums = 6459fdc3211585c0cdf120427579c12149b02161efe273a64b825c05e9aa69c2
 
 pkgname = r-lifecycle
diff --git a/PKGBUILD b/PKGBUILD
index 76775f038eaf..1db660221c84 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,18 @@
-# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
+# 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>
 
 _pkgname=lifecycle
 _pkgver=1.0.3
 pkgname=r-${_pkgname,,}
-pkgver=1.0.3
-pkgrel=5
-pkgdesc='Manage the Life Cycle of your Package Functions'
-arch=('any')
+pkgver=${_pkgver//-/.}
+pkgrel=7
+pkgdesc="Manage the Life Cycle of your Package Functions"
+arch=(any)
 url="https://cran.r-project.org/package=${_pkgname}"
-license=('MIT')
+license=(MIT)
 depends=(
-  r
   r-cli
   r-glue
   r-rlang
@@ -26,20 +26,22 @@ optdepends=(
   r-testthat
   r-tibble
   r-tidyverse
-  r-tools
   r-vctrs
   r-withr
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('023bff9f9b99ca56ed01b705a41a8bed')
 sha256sums=('6459fdc3211585c0cdf120427579c12149b02161efe273a64b825c05e9aa69c2')
 
 build() {
-  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
+  mkdir -p build
+  R CMD INSTALL "$_pkgname" -l build
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
-  cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library"
-  install -Dm644 "${_pkgname}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
+
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s "/usr/lib/R/library/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
 }
-# vim:set ts=2 sw=2 et: