Fixed PKGBUILD

2 files changed, 27 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a32ac7e5d128..a0bf99d38880 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,13 @@
 pkgbase = r-tidyr
-	pkgdesc = Tidy messy data.
+	pkgdesc = Tidy Messy Data
 	pkgver = 1.0.2
 	pkgrel = 1
 	url = https://cran.r-project.org/package=tidyr
-	arch = any
+	arch = i686
+	arch = x86_64
 	license = MIT
-	depends = r>=3.1.0
+	makedepends = gcc
+	depends = r>=3.1
 	depends = r-dplyr>=0.8.2
 	depends = r-ellipsis>=0.1.0
 	depends = r-glue
@@ -22,10 +24,10 @@ pkgbase = r-tidyr
 	optdepends = r-jsonlite
 	optdepends = r-knitr
 	optdepends = r-repurrrsive
-	optdepends = r-markdown
+	optdepends = r-rmarkdown
 	optdepends = r-readr
 	optdepends = r-testthat
-	source = http://cran.r-project.org/src/contrib/tidyr_1.0.2.tar.gz
+	source = https://cran.r-project.org/src/contrib/tidyr_1.0.2.tar.gz
 	md5sums = 9118722418f48877650f6dcf9e160606
 
 pkgname = r-tidyr
diff --git a/PKGBUILD b/PKGBUILD
index de6c88851373..a411220e86c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,30 @@
-# Maintainer: frichtlm <frichtlm@gmail.com>
+# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Contributor: frichtlm <frichtlm@gmail.com>
+
 _cranname=tidyr
 _cranver=1.0.2
-pkgname=r-$_cranname
-pkgver=${_cranver}
+pkgname=r-${_cranname,,}
+pkgver=${_cranver//[:-]/.}
 pkgrel=1
-pkgdesc="Tidy messy data."
-url="https://cran.r-project.org/package=tidyr"
-arch=('any')
-license=('MIT')
-depends=('r>=3.1.0' 'r-dplyr>=0.8.2' 'r-ellipsis>=0.1.0' 'r-glue' 'r-magrittr' 'r-purrr' 'r-rcpp' 'r-rlang' 'r-stringi' 'r-tibble>=2.1.1' 'r-tidyselect>=0.2.5' 'r-vctrs>=0.2.0' 'r-lifecycle')
-optdepends=('r-covr' 'r-jsonlite' 'r-knitr' 'r-repurrrsive' 'r-markdown' 'r-readr' 'r-testthat')
-source=("http://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+pkgdesc="Tidy Messy Data"
+arch=(i686 x86_64)
+url="https://cran.r-project.org/package=${_cranname}"
+license=(MIT)
+depends=('r>=3.1' 'r-dplyr>=0.8.2' 'r-ellipsis>=0.1.0' r-glue r-magrittr r-purrr r-rcpp r-rlang r-stringi 'r-tibble>=2.1.1' 'r-tidyselect>=0.2.5' 'r-vctrs>=0.2.0' r-lifecycle)
+makedepends=(gcc)
+optdepends=(r-covr r-jsonlite r-knitr r-repurrrsive r-rmarkdown r-readr r-testthat)
+source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
 md5sums=('9118722418f48877650f6dcf9e160606')
 
 build() {
-    cd ${srcdir}
-    R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l $srcdir
+  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"
+  cd "${srcdir}"
+
+  install -dm0755 "${pkgdir}/usr/lib/R/library"
+  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
 }