Updated to version 1.0.0

2 files changed, 23 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e60b26a5def8..1dc36f98fa8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,32 @@
 pkgbase = r-tidyr
 	pkgdesc = An evolution of 'reshape2'. It's designed specifically for data tidying (not general reshaping or aggregating) and works well with 'dplyr' data pipelines.
-	pkgver = 0.8.3
+	pkgver = 1.0.0
 	pkgrel = 1
 	url = https://cran.r-project.org/package=tidyr
 	arch = i686
 	arch = x86_64
 	license = MIT
 	depends = r>=3.1.0
-	depends = r-dplyr>=0.7.0
+	depends = r-dplyr>=0.8.2
+	depends = r-ellipsis>=0.1.0
 	depends = r-glue
 	depends = r-magrittr
 	depends = r-purrr
 	depends = r-rcpp
 	depends = r-rlang
 	depends = r-stringi
-	depends = r-tibble
+	depends = r-tibble>=2.1.1
 	depends = r-tidyselect>=0.2.5
+	depends = r-vctrs>=0.2.0
+	depends = r-lifecycle
 	optdepends = r-covr
-	optdepends = r-gapminder
+	optdepends = r-jsonlite
 	optdepends = r-knitr
-	optdepends = r-markdown
+	optdepends = r-repurrrsive
+	optdepends = r-readr
 	optdepends = r-testthat
-	source = http://cran.r-project.org/src/contrib/tidyr_0.8.3.tar.gz
-	md5sums = c6ba9a7b19f830eca482b42c3ee2ef43
+	source = http://cran.r-project.org/src/contrib/tidyr_1.0.0.tar.gz
+	md5sums = aa176afd716bc7c3243d4988f0fc8c03
 
 pkgname = r-tidyr
 
diff --git a/PKGBUILD b/PKGBUILD
index e431ba38ecee..194be3116075 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: frichtlm <frichtlm@gmail.com>
 _cranname=tidyr
-_cranver=0.8.3
+_cranver=1.0.0
 pkgname=r-$_cranname
 pkgver=${_cranver}
 pkgrel=1
@@ -8,13 +8,18 @@ pkgdesc="An evolution of 'reshape2'. It's designed specifically for data tidying
 url="https://cran.r-project.org/package=tidyr"
 arch=('i686' 'x86_64')
 license=('MIT')
-depends=('r>=3.1.0' 'r-dplyr>=0.7.0' 'r-glue' 'r-magrittr' 'r-purrr' 'r-rcpp' 'r-rlang' 'r-stringi' 'r-tibble' 'r-tidyselect>=0.2.5')
-optdepends=('r-covr' 'r-gapminder' 'r-knitr' 'r-markdown' 'r-testthat')
+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-readr' 'r-testthat')
 source=("http://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-md5sums=('c6ba9a7b19f830eca482b42c3ee2ef43') 
+md5sums=('aa176afd716bc7c3243d4988f0fc8c03') 
 
-package() {
-    mkdir -p ${pkgdir}/usr/lib/R/library
+build() {
     cd ${srcdir}
-    R CMD INSTALL ${_cranname} -l ${pkgdir}/usr/lib/R/library
+    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"
 }