[lilac] updated to 2.10.0-1

2 files changed, 47 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 65b465362bc1..987954b40756 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,25 @@
 pkgbase = r-spam
 	pkgdesc = SPArse Matrix
-	pkgver = 2.9.1
-	pkgrel = 4
+	pkgver = 2.10.0
+	pkgrel = 1
 	url = https://cran.r-project.org/package=spam
 	arch = x86_64
-	license = LGPL
+	license = BSD
+	checkdepends = r-testthat
 	makedepends = gcc-fortran
-	depends = r
+	depends = blas
+	depends = lapack
 	depends = r-dotcall64
+	depends = r-rcpp
 	optdepends = r-fields
 	optdepends = r-knitr
-	optdepends = r-matrix
 	optdepends = r-r.rsp
 	optdepends = r-rmarkdown
 	optdepends = r-spam64
 	optdepends = r-testthat
 	optdepends = r-truncdist
-	source = https://cran.r-project.org/src/contrib/spam_2.9-1.tar.gz
-	sha256sums = c32e219279988b1bfc258aaf64f5a46efa558202848a9ae64946ffbe8b497ddb
+	source = https://cran.r-project.org/src/contrib/spam_2.10-0.tar.gz
+	md5sums = 544bbc0a7ae76ef34ed01bf61c666f82
+	sha256sums = 719c86a23801ecf051ffd8291912ee3567af4010e74af470fbf09e274728ac79
 
 pkgname = r-spam
diff --git a/PKGBUILD b/PKGBUILD
index a0662c71c43a..d5b95637af46 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,62 @@
-# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 # Contributor: Robert Greener <me@r0bert.dev>
 # Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 
 _pkgname=spam
-_pkgver=2.9-1
+_pkgver=2.10-0
 pkgname=r-${_pkgname,,}
-pkgver=2.9.1
-pkgrel=4
-pkgdesc='SPArse Matrix'
-arch=('x86_64')
+pkgver=${_pkgver//-/.}
+pkgrel=1
+pkgdesc="SPArse Matrix"
+arch=(x86_64)
 url="https://cran.r-project.org/package=${_pkgname}"
-license=('LGPL')
+license=(BSD)
 depends=(
-  r
+  blas
+  lapack
   r-dotcall64
+  r-rcpp
+)
+makedepends=(
+  gcc-fortran
+)
+checkdepends=(
+  r-testthat
 )
 optdepends=(
   r-fields
   r-knitr
-  r-matrix
   r-r.rsp
   r-rmarkdown
   r-spam64
   r-testthat
   r-truncdist
 )
-makedepends=(
-  gcc-fortran
-)
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('c32e219279988b1bfc258aaf64f5a46efa558202848a9ae64946ffbe8b497ddb')
+md5sums=('544bbc0a7ae76ef34ed01bf61c666f82')
+sha256sums=('719c86a23801ecf051ffd8291912ee3567af4010e74af470fbf09e274728ac79')
+
+prepare() {
+  # skip tests that require r-fields
+  sed -i "/require('fields')/i skip_if_not_installed('fields')" \
+      "$_pkgname/tests/testthat/test-rmvnorm.R"
+}
 
 build() {
-  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
+  mkdir -p build
+  R CMD INSTALL "$_pkgname" -l build
+}
+
+check() {
+  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 "${_pkgname}" "${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 -d "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s "/usr/lib/R/library/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
 }
-# vim:set ts=2 sw=2 et: