summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD5
2 files changed, 6 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f56467e2892d..01af65b0228f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Thu Sep 22 07:01:43 UTC 2016
+# Thu Oct 20 01:08:13 UTC 2016
pkgbase = jasp-rbundle
pkgdesc = A bundle of R packages needed by JASP desktop
pkgver = 2016.09.22
@@ -10,7 +10,9 @@ pkgbase = jasp-rbundle
makedepends = gcc-fortran
depends = r
provides = r-cran-rinside
+ provides = r-cran-rcpp
conflicts = r-cran-rinside
+ conflicts = r-cran-rcpp
source = rbundle.R
md5sums = 3e460035be3f27cd4a059166b1db2785
diff --git a/PKGBUILD b/PKGBUILD
index f1d4a0456773..5ff27a4c1fe7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,8 +12,8 @@ source=("rbundle.R")
pkgver() {
echo $(date +%Y.%m.%d)
}
-provides=('r-cran-rinside')
-conflicts=('r-cran-rinside')
+provides=('r-cran-rinside' 'r-cran-rcpp')
+conflicts=('r-cran-rinside' 'r-cran-rcpp')
prepare(){
@@ -30,5 +30,6 @@ package(){
cp -r $srcdir/usr $pkgdir/
mkdir -p $pkgdir/usr/lib/R/library
mv $pkgdir/usr/share/jasp-desktop/R/library/RInside $pkgdir/usr/lib/R/library/
+ mv $pkgdir/usr/share/jasp-desktop/R/library/Rcpp $pkgdir/usr/lib/R/library/
}
md5sums=('3e460035be3f27cd4a059166b1db2785')