upgpkg: r-r5r 1.0.1-1

upstream release

2 files changed, 9 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f5c1e6600c4e..51ed3f85c619 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,11 +8,14 @@ pkgbase = r-r5r
 	checkdepends = r-covr
 	checkdepends = r-dplyr
 	checkdepends = r-ggplot2>=3.3.1
+	checkdepends = r-gtfstools
+	checkdepends = r-h3jsr>=1.3.0
 	checkdepends = r-interp
 	checkdepends = r-knitr
 	checkdepends = r-patchwork
 	checkdepends = r-rmarkdown
 	checkdepends = r-testthat
+	depends = jdk11-openjdk
 	depends = r-checkmate
 	depends = r-curl
 	depends = r-data.table
diff --git a/PKGBUILD b/PKGBUILD
index e9e666f6ab80..8cc42d88b721 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,6 +11,7 @@ pkgrel=1
 
 arch=("any")
 depends=(
+    "jdk11-openjdk"
     "r-checkmate"
     "r-curl"
     "r-data.table"
@@ -35,13 +36,7 @@ optdepends=(
     "r-rmarkdown"
 )
 checkdepends=(
-    "r-covr"
-    "r-dplyr"
-    "r-ggplot2>=3.3.1"
-    "r-interp"
-    "r-knitr"
-    "r-patchwork"
-    "r-rmarkdown"
+    "${optdepends[@]}"
     "r-testthat"
 )
 
@@ -54,8 +49,11 @@ build() {
 }
 
 check() {
+    #export R_HOME="${srcdir}/R_HOME/"
+    #mkdir -p "${R_HOME}"
+    #R CMD javareconf
     cd "${srcdir}/${_cranname}/tests"
-    R_LIBS="${srcdir}/build/" Rscript --vanilla testthat.R
+    NOT_CRAN=true R_LIBS="${srcdir}/build/" Rscript --vanilla testthat.R
 }
 
 package() {