Fixed PKGBUILD

2 files changed, 21 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8335ec35ced..92bbee1697e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,12 +3,13 @@ pkgbase = r-minqa
 	pkgver = 1.2.4
 	pkgrel = 1
 	url = https://cran.r-project.org/package=minqa
-	arch = any
+	arch = i686
+	arch = x86_64
 	license = GPL2
+	makedepends = gcc
 	makedepends = make
-	makedepends = gcc-fortran
 	depends = r
-	depends = r-rcpp
+	depends = r-rcpp>=0.9.10
 	source = https://cran.r-project.org/src/contrib/minqa_1.2.4.tar.gz
 	md5sums = bcaae4fdba60a33528f2116e2fd51105
 
diff --git a/PKGBUILD b/PKGBUILD
index b7edba7f2eee..82db029440dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,29 @@
-# Maintainer: Taekyung Kim <Taekyung.Kim.Maths@gmail.com>
+# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Contributor: Taekyung Kim <Taekyung.Kim.Maths@gmail.com>
 
 _cranname=minqa
 _cranver=1.2.4
-_pkgtar=${_cranname}_${_cranver}.tar.gz
-pkgname=r-minqa
+pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
 pkgrel=1
 pkgdesc="Derivative-free optimization algorithms by quadratic approximation"
-arch=('any')
+arch=(i686 x86_64)
 url="https://cran.r-project.org/package=${_cranname}"
-license=('GPL2')
-depends=('r' 'r-rcpp')
-makedepends=('make' 'gcc-fortran')
-source=("https://cran.r-project.org/src/contrib/${_pkgtar}")
+license=(GPL2)
+depends=(r 'r-rcpp>=0.9.10')
+makedepends=(gcc make)
+source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
 md5sums=('bcaae4fdba60a33528f2116e2fd51105')
 
-build(){
-    R CMD INSTALL "${_pkgtar}" -l "$srcdir"
-}
-package() {
-    install -dm0755 "$pkgdir"/usr/lib/R/library
-    cp -a --no-preserve=ownership "$_cranname" "$pkgdir"/usr/lib/R/library
+build() {
+  cd "${srcdir}"
+
+  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l ${srcdir}
 }
 
+package() {
+  cd "${srcdir}"
 
+  install -dm0755 "${pkgdir}/usr/lib/R/library"
+  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+}