takeover package

2 files changed, 29 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 78d2a33a4c68..8a9489375d7f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = r-cellranger
 	pkgdesc = Translate Spreadsheet Cell Ranges to Rows and Columns
 	pkgver = 1.1.0
-	pkgrel = 1
+	pkgrel = 4
 	url = https://cran.r-project.org/package=cellranger
 	arch = any
 	license = MIT
-	depends = r>=3.0.0
+	depends = r
 	depends = r-rematch
 	depends = r-tibble
 	optdepends = r-covr
-	optdepends = r-testthat
 	optdepends = r-knitr
 	optdepends = r-rmarkdown
+	optdepends = r-testthat
 	source = https://cran.r-project.org/src/contrib/cellranger_1.1.0.tar.gz
 	sha256sums = 5d38f288c752bbb9cea6ff830b8388bdd65a8571fd82d8d96064586bd588cf99
 
diff --git a/PKGBUILD b/PKGBUILD
index 349195a40824..aa53e8d0cd36 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,35 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
-# Contributor: Alex Branham <branham@utexas.edu>
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=cellranger
-_cranver=1.1.0
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
-pkgdesc="Translate Spreadsheet Cell Ranges to Rows and Columns"
-arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(MIT)
-depends=('r>=3.0.0' r-rematch r-tibble)
-optdepends=(r-covr r-testthat r-knitr r-rmarkdown)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+_pkgname=cellranger
+_pkgver=1.1.0
+pkgname=r-${_pkgname,,}
+pkgver=1.1.0
+pkgrel=4
+pkgdesc='Translate Spreadsheet Cell Ranges to Rows and Columns'
+arch=('any')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('MIT')
+depends=(
+  r
+  r-rematch
+  r-tibble
+)
+optdepends=(
+  r-covr
+  r-knitr
+  r-rmarkdown
+  r-testthat
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
 sha256sums=('5d38f288c752bbb9cea6ff830b8388bdd65a8571fd82d8d96064586bd588cf99')
 
 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: