[lilac] updated to 1.6.1-1

2 files changed, 32 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ff438095548a..1f6dc31adb35 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
 pkgbase = r-biodbhmdb
 	pkgdesc = biodbHmdb, a library for connecting to the HMDB Database
-	pkgver = 1.6.0
+	pkgver = 1.6.1
 	pkgrel = 1
 	url = https://bioconductor.org/packages/biodbHmdb
 	arch = x86_64
-	license = AGPL
-	depends = r
+	license = AGPL3
+	checkdepends = r-xml2
+	makedepends = r-testthat
 	depends = r-biodb
 	depends = r-r6
 	depends = r-rcpp
-	depends = r-testthat
+	depends = r-zip
 	optdepends = r-biocstyle
 	optdepends = r-covr
 	optdepends = r-devtools
@@ -18,7 +19,8 @@ pkgbase = r-biodbhmdb
 	optdepends = r-rmarkdown
 	optdepends = r-roxygen2
 	optdepends = r-testthat
-	source = https://bioconductor.org/packages/release/bioc/src/contrib/biodbHmdb_1.6.0.tar.gz
-	sha256sums = 883e86fa568deb09cd835174da77c186b6b08d0e655ccfbbecd05834e7960862
+	source = https://bioconductor.org/packages/release/bioc/src/contrib/biodbHmdb_1.6.1.tar.gz
+	md5sums = 3e2269f5f98740e0a8caad6610ba960b
+	sha256sums = b704087955926d42c01e624b39b8504f3ca63f587c8494ad37240cdcbabd7c9c
 
 pkgname = r-biodbhmdb
diff --git a/PKGBUILD b/PKGBUILD
index 31c75eebf97d..b1bb83e2f707 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,27 @@
-# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 
 _pkgname=biodbHmdb
-_pkgver=1.6.0
+_pkgver=1.6.1
 pkgname=r-${_pkgname,,}
-pkgver=1.6.0
+pkgver=${_pkgver//-/.}
 pkgrel=1
-pkgdesc='biodbHmdb, a library for connecting to the HMDB Database'
-arch=('x86_64')
+pkgdesc="biodbHmdb, a library for connecting to the HMDB Database"
+arch=(x86_64)
 url="https://bioconductor.org/packages/${_pkgname}"
-license=('AGPL')
+license=(AGPL3)
 depends=(
-  r
   r-biodb
   r-r6
   r-rcpp
+  r-zip
+)
+makedepends=(
   r-testthat
 )
+checkdepends=(
+  r-xml2
+)
 optdepends=(
   r-biocstyle
   r-covr
@@ -27,14 +33,20 @@ optdepends=(
   r-testthat
 )
 source=("https://bioconductor.org/packages/release/bioc/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('883e86fa568deb09cd835174da77c186b6b08d0e655ccfbbecd05834e7960862')
+md5sums=('3e2269f5f98740e0a8caad6610ba960b')
+sha256sums=('b704087955926d42c01e624b39b8504f3ca63f587c8494ad37240cdcbabd7c9c')
 
 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"
 }
-# vim:set ts=2 sw=2 et: