upgpkg: r-sfheaders 0.4.2-2

2 files changed, 15 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3b5d898e7fa..0396b2f8d6f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,19 @@
 pkgbase = r-sfheaders
 	pkgdesc = Converts Between R Objects and Simple Feature Objects
 	pkgver = 0.4.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cran.r-project.org/package=sfheaders
 	arch = i686
 	arch = x86_64
 	license = MIT
+	checkdepends = r-covr
+	checkdepends = r-knitr
+	checkdepends = r-testthat
 	depends = r>=3.0.2
 	depends = r-geometries>=0.2.2
 	depends = r-rcpp>=1.0.10
 	optdepends = r-covr
 	optdepends = r-knitr
-	optdepends = r-testthat
 	source = https://cran.r-project.org/src/contrib/sfheaders_0.4.2.tar.gz
 	b2sums = 2652abb2afda69455faab4b74ae28f397a83793cdc387a00b001f7535bc8ee220534a52cf0d78896c084ca9173af177e0a03394d0594521f13ac4310bfebca2b
 
diff --git a/PKGBUILD b/PKGBUILD
index 62ec847bc297..3bafd6cf5907 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgdesc="Converts Between R Objects and Simple Feature Objects"
 url="https://cran.r-project.org/package=sfheaders"
 license=("MIT")
 pkgver=${_cranver//[:-]/.}
-pkgrel=1
+pkgrel=2
 
 arch=("i686" "x86_64")
 depends=(
@@ -18,20 +18,27 @@ depends=(
 optdepends=(
     "r-covr"
     "r-knitr"
+)
+checkdepends=(
+    "${optdepends[@]}"
     "r-testthat"
 )
-makedepends=()
 
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
 b2sums=('2652abb2afda69455faab4b74ae28f397a83793cdc387a00b001f7535bc8ee220534a52cf0d78896c084ca9173af177e0a03394d0594521f13ac4310bfebca2b')
 
 build() {
-    R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+    mkdir -p "${srcdir}/build/"
+    R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}/build/"
+}
+
+check() {
+    R_LIBS="build/" R CMD check --no-manual --as-cran "${_cranname}"
 }
 
 package() {
     install -dm0755 "${pkgdir}/usr/lib/R/library"
-    cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+    cp -a --no-preserve=ownership "${srcdir}/build/${_cranname}" "${pkgdir}/usr/lib/R/library"
 
     if [[ -f "${_cranname}/LICENSE" ]]; then
         install -Dm0644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"