Update 1.2-3

2 files changed, 15 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 83b476ccccf4..7252c287cd7d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = r-formula
 	pkgdesc = Extended Model Formulas
-	pkgver = 1.2.3
+	pkgver = 1.2.4
 	pkgrel = 1
 	url = https://cran.r-project.org/package=Formula
 	arch = any
+	license = GPL2
 	license = GPL3
-	depends = r
-	source = http://cran.r-project.org/src/contrib/Formula_1.2-3.tar.gz
-	md5sums = 861ccadaeca8b1fd16ec6857cc3dcb5b
+	depends = r>=2.0.0
+	source = https://cran.r-project.org/src/contrib/Formula_1.2-4.tar.gz
+	sha256sums = cb70e373b5ed2fc8450937fb3321d37dfd22dcc6f07cb872a419d51205125caf
 
 pkgname = r-formula
 
diff --git a/PKGBUILD b/PKGBUILD
index e2ce89a40e38..dc01d7f6c755 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,24 @@
 # Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 
 _cranname=Formula
-_cranver=1.2-3
-pkgname=r-formula
+_cranver=1.2-4
+pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
 pkgrel=1
 pkgdesc="Extended Model Formulas"
 arch=(any)
 url="https://cran.r-project.org/package=${_cranname}"
-license=('GPL3')
-depends=('r')
-source=("http://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-md5sums=('861ccadaeca8b1fd16ec6857cc3dcb5b')
+license=(GPL2 GPL3)
+depends=('r>=2.0.0')
+source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+sha256sums=('cb70e373b5ed2fc8450937fb3321d37dfd22dcc6f07cb872a419d51205125caf')
 
-build(){
-    cd "${srcdir}"
-
-    R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l $srcdir
+build() {
+  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
 }
 
 package() {
-    cd "${srcdir}"
+  install -dm0755 "${pkgdir}/usr/lib/R/library"
 
-    install -dm0755 "$pkgdir/usr/lib/R/library"
-    cp -a --no-preserve=ownership "$_cranname" "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
 }