takeover package

2 files changed, 25 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 095ba5b4a36d..6be5a76ac774 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = r-rversions
 	pkgdesc = Query 'R' Versions, Including 'r-release' and 'r-oldrel'
 	pkgver = 2.1.1
-	pkgrel = 1
+	pkgrel = 4
 	url = https://cran.r-project.org/package=rversions
 	arch = any
 	license = MIT
 	depends = r
 	depends = r-curl
-	depends = r-xml2>=1.0.0
+	depends = r-xml2
 	optdepends = r-mockery
 	optdepends = r-testthat
 	source = https://cran.r-project.org/src/contrib/rversions_2.1.1.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index ecf61b4db4da..f101501f1092 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,33 @@
-# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=rversions
-_cranver=2.1.1
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=rversions
+_pkgver=2.1.1
+pkgname=r-${_pkgname,,}
+pkgver=2.1.1
+pkgrel=4
 pkgdesc="Query 'R' Versions, Including 'r-release' and 'r-oldrel'"
-arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(MIT)
-depends=(r r-curl 'r-xml2>=1.0.0')
-optdepends=(r-mockery r-testthat)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+arch=('any')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('MIT')
+depends=(
+  r
+  r-curl
+  r-xml2
+)
+optdepends=(
+  r-mockery
+  r-testthat
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
 sha256sums=('79aaacf5a1258d91ac0ddedf3c8c16a2d10d39010993dcc7b0a2638afee27cb1')
 
 build() {
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
 }
 
 package() {
   install -dm0755 "${pkgdir}/usr/lib/R/library"
-
-  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+  cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library"
+  install -Dm644 "${_pkgname}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
+# vim:set ts=2 sw=2 et: