[lilac] updated to 0.1.4-2

2 files changed, 31 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 548b3ab57364..a6dc93f6efe9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,20 @@
 pkgbase = r-transformr
 	pkgdesc = Polygon and Path Transformations
 	pkgver = 0.1.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cran.r-project.org/package=transformr
-	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = r-cpp11
-	depends = r-tweenr
+	depends = r-lpsolve
 	depends = r-rlang
 	depends = r-sf
-	depends = r-lpsolve
+	depends = r-tweenr
 	depends = r-vctrs
 	optdepends = r-covr
 	optdepends = r-magrittr
 	source = https://cran.r-project.org/src/contrib/transformr_0.1.4.tar.gz
-	source = CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
+	md5sums = 94b6d03d1bd089fa3dc47de6dac69d90
 	sha256sums = c193bc8217c2483933df91863892743f8b5fb03d309df7cd2b6c76e9b1661f40
-	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-transformr
diff --git a/PKGBUILD b/PKGBUILD
index 7320a77eaa61..6d8eaaf1590d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,41 @@
 # Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
 
-_cranname=transformr
-_cranver=0.1.4
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=transformr
+_pkgver=0.1.4
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
+pkgrel=2
 pkgdesc="Polygon and Path Transformations"
-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-tweenr
-    r-rlang
-    r-sf
-    r-lpsolve
-    r-vctrs
+  r-lpsolve
+  r-rlang
+  r-sf
+  r-tweenr
+  r-vctrs
 )
-makedepends=(r-cpp11)
-optdepends=(r-covr r-magrittr)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
-        "CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT")
-sha256sums=('c193bc8217c2483933df91863892743f8b5fb03d309df7cd2b6c76e9b1661f40'
-            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
+makedepends=(
+  r-cpp11
+)
+optdepends=(
+  r-covr
+  r-magrittr
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('94b6d03d1bd089fa3dc47de6dac69d90')
+sha256sums=('c193bc8217c2483933df91863892743f8b5fb03d309df7cd2b6c76e9b1661f40')
 
 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"
 }