Update to version 1.3-1

Update to sp 1.3-1.
Change name from r-cran-sp to r-sp.
Change build methods to be more in-line with other AUR R packages.

2 files changed, 27 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 301db61d2bfd..694c63ab4eae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
-pkgbase = r-cran-sp
+pkgbase = r-sp
 	pkgdesc = Classes and Methods for Spatial Data
-	pkgver = 1.2
+	pkgver = 1.3
 	pkgrel = 1
-	url = https://cran.r-project.org/web/packages/sp/index.html
+	url = https://cran.r-project.org/package=sp
 	arch = x86_64
 	arch = i686
 	license = GPL2
 	license = GPL3
-	depends = r
-	source = https://cran.r-project.org/src/contrib/sp_1.2-3.tar.gz
-	md5sums = f0e24d993dec128642ee66b6b47b10c1
+	depends = r>=3.0
+	provides = r-sp
+	conflicts = r-cran-sp
+	source = https://cran.r-project.org/src/contrib/sp_1.3-1.tar.gz
+	sha256sums = 57988b53ba8acc35f3912d62feba4b929a0f757c6b54080c623c5d805e0cb59f
 
-pkgname = r-cran-sp
+pkgname = r-sp
 
diff --git a/PKGBUILD b/PKGBUILD
index 333731b37c01..4692570f42c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,25 @@
-pkgname=r-cran-sp
-_cranname=sp
-_cranrel=3
-pkgver=1.2
+# Maintainer: Jooa <aur at (name) dot xyz>
+pkgname=r-sp
+pkgver=1.3
 pkgrel=1
+_cranname=sp
+_cranrel=1
+_pkgfile=${_cranname}_${pkgver}-${_cranrel}.tar.gz
 pkgdesc="Classes and Methods for Spatial Data"
-url="https://cran.r-project.org/web/packages/${_cranname}/index.html"
+url="https://cran.r-project.org/package=${_cranname}"
 arch=('x86_64' 'i686')
 license=('GPL2' 'GPL3')
-depends=('r')
-source=(https://cran.r-project.org/src/contrib/${_cranname}_${pkgver}-${_cranrel}.tar.gz)
-md5sums=('f0e24d993dec128642ee66b6b47b10c1')
+depends=('r>=3.0')
+provides=('r-sp')
+conflicts=('r-cran-sp')
+source=(https://cran.r-project.org/src/contrib/${_pkgfile})
+sha256sums=('57988b53ba8acc35f3912d62feba4b929a0f757c6b54080c623c5d805e0cb59f')
 
-package() {
-	mkdir -p ${pkgdir}/usr/lib/R/library
-	cd "${srcdir}"
-	R CMD INSTALL ${_cranname} -l ${pkgdir}/usr/lib/R/library
+build() {
+	R CMD INSTALL ${_pkgfile} -l ${srcdir}
 }
 
+package() {
+	install -d ${pkgdir}/usr/lib/R/library
+	cp -r "$srcdir/$_cranname" "$pkgdir/usr/lib/R/library"
+}