Upkg 1.2.2

2 files changed, 13 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ee28acc9a77c..b54dd3c5438b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = r-dbplyr
 	pkgdesc = A dplyr Back End for Databases
-	pkgver = 1.2.1
+	pkgver = 1.2.2
 	pkgrel = 1
 	url = https://cran.r-project.org/package=dbplyr
 	arch = any
@@ -26,8 +26,9 @@ pkgbase = r-dbplyr
 	optdepends = r-rpostgresql
 	optdepends = r-rsqlite
 	optdepends = r-testthat
-	source = https://cran.r-project.org/src/contrib/dbplyr_1.2.1.tar.gz
-	md5sums = 3132707768f771374209ae65fd9055de
+	optdepends = r-withr
+	source = https://cran.r-project.org/src/contrib/dbplyr_1.2.2.tar.gz
+	md5sums = 235c957d5912cfc989d0bd44513c2c37
 
 pkgname = r-dbplyr
 
diff --git a/PKGBUILD b/PKGBUILD
index db091942f791..b07bc23083c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,22 @@
 # Maintainer: Alex Branham <branham@utexas.edu>
-_cranname=dbplyr
-_cranver=1.2.1
-_pkgtar=${_cranname}_${_cranver}.tar.gz
+_cranver=1.2.2
 pkgname=r-dbplyr
 pkgver=${_cranver//[:-]/.}
 pkgrel=1
-pkgdesc="A dplyr Back End for Databases"
+pkgdesc='A dplyr Back End for Databases'
 arch=('any')
-url="https://cran.r-project.org/package=${_cranname}"
+url='https://cran.r-project.org/package=dbplyr'
 license=('MIT')
 depends=('r' 'r-assertthat>=0.2.0' 'r-dbi>=0.7' 'r-dplyr>=0.7.4' 'r-glue>=1.2.0' 'r-purrr>=0.2.4' 'r-r6>=2.2.2' 'r-rlang>=0.1.6' 'r-tibble>=1.4.1' 'r-tidyselect>=0.2.2')
-
-optdepends=('r-bit64' 'r-covr' 'r-knitr' 'r-lahman' 'r-nycflights13' 'r-rmarkdown' 'r-rmariadb' 'r-rmysql' 'r-rpostgresql' 'r-rsqlite' 'r-testthat')
-
-source=("https://cran.r-project.org/src/contrib/${_pkgtar}")
-md5sums=('3132707768f771374209ae65fd9055de')
+optdepends=('r-bit64' 'r-covr' 'r-knitr' 'r-lahman' 'r-nycflights13' 'r-rmarkdown' 'r-rmariadb' 'r-rmysql' 'r-rpostgresql' 'r-rsqlite' 'r-testthat' 'r-withr')
+source=("https://cran.r-project.org/src/contrib/dbplyr_"$_cranver".tar.gz")
+md5sums=('235c957d5912cfc989d0bd44513c2c37')
 
 build(){
-    R CMD INSTALL ${_pkgtar} -l $srcdir
+    R CMD INSTALL dbplyr_"$_cranver".tar.gz -l "$srcdir"
 }
 package() {
-    install -d "$pkgdir/usr/lib/R/library"
-    cp -r "$srcdir/$_cranname" "$pkgdir/usr/lib/R/library"
+    install -dm0755 "$pkgdir"/usr/lib/R/library
+    cp -a --no-preserve=ownership dbplyr "$pkgdir"/usr/lib/R/library
 }