[lilac] updated to 0.15.0-2

2 files changed, 8 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9a7a0a1e71c6..d9500df2f4cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 pkgbase = r-jaspfactor
 	pkgdesc = Factor Module for JASP
 	pkgver = 0.15.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/jasp-stats/jaspFactor
-	arch = x86_64
+	arch = any
 	groups = r-jasp
 	groups = r-jaspcommon
 	license = GPL
diff --git a/PKGBUILD b/PKGBUILD
index 7a9c2336bca5..410f365480ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@ _pkgname=jaspFactor
 _pkgver=0.15.0
 pkgname=r-${_pkgname,,}
 pkgver=0.15.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Factor Module for JASP"
-arch=('x86_64')
+arch=('any')
 url="https://github.com/jasp-stats/${_pkgname}"
 license=('GPL')
 depends=(r
@@ -29,13 +29,13 @@ sha256sums=('SKIP')
 
 
 build() {
-  mkdir -p ${srcdir}/usr/lib/R/library
-  R -e "install.packages('${srcdir}/${_pkgname}',\
-     type='source', repos=NULL,lib='${srcdir}/usr/lib/R/library', INSTALL_opts='--no-multiarch --no-docs --no-test-load')"
+  tar -cvf ${srcdir}/${_pkgname}_${_pkgver}.tar.gz ${_pkgname}
+  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
 }
 
 package() {
-  cp -a --no-preserve=ownership "${srcdir}/usr" "${pkgdir}"
+  install -dm0755 "${pkgdir}/usr/lib/R/library"
+  cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library"
   mkdir -p  ${pkgdir}/usr/lib/jasp-desktop/Modules
   ln -s /usr/lib/R/library ${pkgdir}/usr/lib/jasp-desktop/Modules/${_pkgname}
 }