takeover package

2 files changed, 31 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9896486a3e88..57edfe13da78 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = r-gitcreds
 	pkgdesc = Query 'git' Credentials from 'R'
 	pkgver = 0.1.1
-	pkgrel = 1
+	pkgrel = 4
 	url = https://cran.r-project.org/package=gitcreds
 	arch = any
 	license = MIT
 	depends = r
 	depends = git
-	optdepends = r-testthat
+	optdepends = r-codetools
 	optdepends = r-knitr
 	optdepends = r-mockery
 	optdepends = r-oskeyring
 	optdepends = r-rmarkdown
+	optdepends = r-testthat
 	optdepends = r-withr
 	source = https://cran.r-project.org/src/contrib/gitcreds_0.1.1.tar.gz
 	sha256sums = b14aaf4e910a9d2d6c65c93e645f0b0159c00898e669f917f83c03dfedb1dfea
 
 pkgname = r-gitcreds
-
diff --git a/PKGBUILD b/PKGBUILD
index 714fb8b0378b..d0475a8d58e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,38 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# system requirements: git
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=gitcreds
-_cranver=0.1.1
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=gitcreds
+_pkgver=0.1.1
+pkgname=r-${_pkgname,,}
+pkgver=0.1.1
+pkgrel=4
 pkgdesc="Query 'git' Credentials from 'R'"
-arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(MIT)
-depends=(r git)
-optdepends=(r-testthat r-knitr r-mockery r-oskeyring r-rmarkdown r-withr)
-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
+  git
+)
+optdepends=(
+  r-codetools
+  r-knitr
+  r-mockery
+  r-oskeyring
+  r-rmarkdown
+  r-testthat
+  r-withr
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
 sha256sums=('b14aaf4e910a9d2d6c65c93e645f0b0159c00898e669f917f83c03dfedb1dfea')
 
 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: