summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD36
2 files changed, 28 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e19aeb59de8..cf811214e14 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,24 @@
pkgbase = r-readxl
pkgdesc = Read Excel Files
- pkgver = 1.1.0
+ pkgver = 1.3.1
pkgrel = 1
url = https://cran.r-project.org/package=readxl
+ arch = i686
arch = x86_64
license = GPL3
+ makedepends = gcc
depends = r
depends = r-cellranger
- depends = r-rcpp>=0.12.12
- depends = r-tibble>=1.1
+ depends = r-rcpp>=0.12.18
+ depends = r-tibble>=1.3.1
+ depends = r-progress
optdepends = r-covr
optdepends = r-knitr
optdepends = r-rmarkdown
optdepends = r-rprojroot
optdepends = r-testthat
- source = https://cran.r-project.org/src/contrib/readxl_1.1.0.tar.gz
- md5sums = 0537e13fae3fc490b2fd1bf44c0dad9b
+ source = https://cran.r-project.org/src/contrib/readxl_1.3.1.tar.gz
+ md5sums = 2face1053adb5104f8347fcd1897d7ad
pkgname = r-readxl
diff --git a/PKGBUILD b/PKGBUILD
index e34860e9d87..48e7f2a3dcb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,30 @@
-# Maintainer: Alex Branham <branham@utexas.edu>
+# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Contributor: Alex Branham <branham@utexas.edu>
+
_cranname=readxl
-_cranver=1.1.0
-_pkgtar=${_cranname}_${_cranver}.tar.gz
-pkgname=r-readxl
+_cranver=1.3.1
+pkgname=r-${_cranname,,}
pkgver=${_cranver//[:-]/.}
pkgrel=1
pkgdesc="Read Excel Files"
-arch=('x86_64')
+arch=(i686 x86_64)
url="https://cran.r-project.org/package=${_cranname}"
-license=('GPL3')
-depends=('r' 'r-cellranger' 'r-rcpp>=0.12.12' 'r-tibble>=1.1')
-
-optdepends=('r-covr' 'r-knitr' 'r-rmarkdown' 'r-rprojroot' 'r-testthat')
+license=(GPL3)
+depends=(r r-cellranger 'r-rcpp>=0.12.18' 'r-tibble>=1.3.1' 'r-progress')
+makedepends=(gcc)
+optdepends=(r-covr r-knitr r-rmarkdown r-rprojroot r-testthat)
+source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+md5sums=('2face1053adb5104f8347fcd1897d7ad')
-source=("https://cran.r-project.org/src/contrib/${_pkgtar}")
-md5sums=('0537e13fae3fc490b2fd1bf44c0dad9b')
+build() {
+ cd "${srcdir}"
-build(){
- R CMD INSTALL ${_pkgtar} -l $srcdir
+ R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l ${srcdir}
}
+
package() {
- install -d "$pkgdir/usr/lib/R/library"
- cp -r "$srcdir/$_cranname" "$pkgdir/usr/lib/R/library"
-}
+ cd "${srcdir}"
+ install -dm0755 "${pkgdir}/usr/lib/R/library"
+ cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+}