upgpkg: r-terra 1.7.18-2

2 files changed, 21 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5c42671de39c..b3df9ea7498f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,18 @@
 pkgbase = r-terra
 	pkgdesc = Spatial Data Analysis
 	pkgver = 1.7.18
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cran.r-project.org/package=terra
 	arch = i686
 	arch = x86_64
 	license = GPL3
+	checkdepends = r-deldir
+	checkdepends = r-leaflet
+	checkdepends = r-ncdf4
+	checkdepends = r-sf>=0.9.8
+	checkdepends = r-tinytest
+	checkdepends = r-xml
+	checkdepends = r-rcmdcheck
 	depends = gdal>=2.2.3
 	depends = geos>=3.4.0
 	depends = proj>=4.9.3
diff --git a/PKGBUILD b/PKGBUILD
index 9c3a91f281f1..3e8321753a87 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgdesc="Spatial Data Analysis"
 url="https://cran.r-project.org/package=${_cranname}"
 license=("GPL3")
 pkgver=${_cranver//[:-]/.}
-pkgrel=1
+pkgrel=2
 
 arch=("i686" "x86_64")
 depends=(
@@ -26,18 +26,27 @@ optdepends=(
     "r-tinytest"
     "r-xml"
 )
-makedepends=()
+checkdepends=(
+    "${optdepends[@]}"
+    "r-rcmdcheck"
+)
 
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
 b2sums=('14aa5b5367ab029c19a6514ebd6ca991087940663ff2f3b8a69855672e8a890b731cb11585c87d54a41f5daf3de4801a409c590e49805927bf9df393faf329bc')
 
 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() {
+    cd "${srcdir}/${_cranname}/"
+    R_LIBS="${srcdir}/build/" R CMD check --no-manual --as-cran .
 }
 
 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"