[lilac] updated to 0.2.0-2

3 files changed, 59 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fd29a9cea498..a241e16ddeca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,21 @@
 pkgbase = r-timechange
 	pkgdesc = Efficient Manipulation of Date-Times
 	pkgver = 0.2.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cran.r-project.org/package=timechange
-	arch = i686
 	arch = x86_64
 	license = GPL3
 	checkdepends = r-testthat
 	makedepends = r-cpp11
 	depends = cctz
 	depends = r
-	optdepends = r-testthat
 	optdepends = r-knitr
+	optdepends = r-testthat
 	source = https://cran.r-project.org/src/contrib/timechange_0.2.0.tar.gz
+	source = system-cctz.patch
+	md5sums = 9e8dea7a23e233cccec70f7838381582
+	md5sums = a573af9ccae2bad5627178a50de35e5b
 	sha256sums = 3d602008052123daef94a5c3f5154c5461b4ec0432ab70c37273d7ddd252f7f1
+	sha256sums = 77d128c19ede66d6f0a27d3751c15da2ac322bdf2ca0914d047ac36396156001
 
 pkgname = r-timechange
diff --git a/PKGBUILD b/PKGBUILD
index 92644a872ab7..78d203c1df7d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,51 @@
 # Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
 
-_cranname=timechange
-_cranver=0.2.0
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=timechange
+_pkgver=0.2.0
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
+pkgrel=2
 pkgdesc="Efficient Manipulation of Date-Times"
-arch=(i686 x86_64)
-url="https://cran.r-project.org/package=${_cranname}"
+arch=(x86_64)
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(GPL3)
-depends=(cctz r)
-makedepends=(r-cpp11)
-checkdepends=(r-testthat)
-optdepends=(r-testthat r-knitr)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('3d602008052123daef94a5c3f5154c5461b4ec0432ab70c37273d7ddd252f7f1')
+depends=(
+  cctz
+  r
+)
+makedepends=(
+  r-cpp11
+)
+checkdepends=(
+  r-testthat
+)
+optdepends=(
+  r-knitr
+  r-testthat
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz"
+        "system-cctz.patch")
+md5sums=('9e8dea7a23e233cccec70f7838381582'
+         'a573af9ccae2bad5627178a50de35e5b')
+sha256sums=('3d602008052123daef94a5c3f5154c5461b4ec0432ab70c37273d7ddd252f7f1'
+            '77d128c19ede66d6f0a27d3751c15da2ac322bdf2ca0914d047ac36396156001')
 
 prepare() {
   # build against system cctz
-  sed -i -e 's/$(SHLIB): libcctz.a/$(SHLIB):/' \
-      -e 's#PKG_CPPFLAGS= -I. -I./cctz/src/#PKG_CPPFLAGS= -I.#' \
-      "$_cranname/src/Makevars"
+  patch -Np1 -i system-cctz.patch
 }
 
 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"
 }
diff --git a/system-cctz.patch b/system-cctz.patch
new file mode 100644
index 000000000000..5e123572da01
--- /dev/null
+++ b/system-cctz.patch
@@ -0,0 +1,20 @@
+diff --git a/timechange/src/Makevars b/timechange/src/Makevars
+index 7233aa3..25cd9ac 100644
+--- a/timechange/src/Makevars
++++ b/timechange/src/Makevars
+@@ -1,5 +1,5 @@
+ CXX_STD = CXX11
+-PKG_CPPFLAGS= -I. -I./cctz/src/
++PKG_CPPFLAGS= -I.
+ PKG_LIBS= -L. -lcctz
+ 
+ LIBCCTZ=./cctz/src/time_zone_fixed.o \
+@@ -11,7 +11,7 @@ LIBCCTZ=./cctz/src/time_zone_fixed.o \
+     ./cctz/src/time_zone_posix.o \
+     ./cctz/src/zone_info_source.o
+ 
+-$(SHLIB): libcctz.a
++$(SHLIB):
+ 
+ libcctz.a: $(LIBCCTZ)
+ 	$(AR) rcs libcctz.a $(LIBCCTZ)