update to version 1.0.4, bump dependencies, fix license

2 files changed, 43 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0493b494a882..65a99f9e6da5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = r-rvest
 	pkgdesc = Easily Harvest (Scrape) Web Pages
-	pkgver = 1.0.3
+	pkgver = 1.0.4
 	pkgrel = 1
 	url = https://cran.r-project.org/package=rvest
 	arch = any
-	license = GPL3
-	depends = r>=3.2
+	license = MIT
+	depends = r>=3.6
 	depends = r-glue
 	depends = r-cli
 	depends = r-httr>=0.5
-	depends = r-lifecycle>=1.0.0
+	depends = r-lifecycle>=1.0.3
 	depends = r-magrittr
-	depends = r-rlang>=1.0.0
+	depends = r-rlang>=1.1.0
 	depends = r-selectr
 	depends = r-tibble
 	depends = r-xml2>=1.3
@@ -25,7 +25,7 @@ pkgbase = r-rvest
 	optdepends = r-stringi>=0.3.1
 	optdepends = r-testthat>=3.0.2
 	optdepends = r-webfakes
-	source = https://cran.r-project.org/src/contrib/rvest_1.0.3.tar.gz
-	sha256sums = a465ef7391afaa3c26eebe8c61db02314ac04c4d8de5aa53f090716763d21c1e
+	source = https://cran.r-project.org/src/contrib/rvest_1.0.4.tar.gz
+	sha256sums = 7d707c6b2994cf7b6c1d665bec872d2ef5c55f30e7c343c447a8a386a6049ca6
 
 pkgname = r-rvest
diff --git a/PKGBUILD b/PKGBUILD
index 830bf807c718..0079541ea133 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
-# Maintainer: Pranav K Anupam <pranavanupam@yahoo.com>
+# Maintainer: Alex Hirzel <alex at hirzel period us>
+# Contributor: Pranav K Anupam <pranavanupam@yahoo.com>
 # Contributor: Alex Branham <branham@utexas.edu>
 _cranname=rvest
-_cranver=1.0.3
+_cranver=1.0.4
 _pkgtar=${_cranname}_${_cranver}.tar.gz
 pkgname=r-rvest
 pkgver=${_cranver//[:-]/.}
@@ -9,19 +10,42 @@ pkgrel=1
 pkgdesc="Easily Harvest (Scrape) Web Pages"
 arch=('any')
 url="https://cran.r-project.org/package=${_cranname}"
-license=('GPL3')
-depends=('r>=3.2' 'r-glue' 'r-cli' 'r-httr>=0.5' 'r-lifecycle>=1.0.0' 'r-magrittr' 'r-rlang>=1.0.0' 'r-selectr' 'r-tibble'  'r-xml2>=1.3' 'r-withr' )
-optdepends=(  'r-covr'  'r-knitr' 'r-readr' 'r-repurrrsive' 'r-rmarkdown'  'r-spelling'  'r-stringi>=0.3.1' 'r-testthat>=3.0.2' 'r-webfakes')
+license=('MIT')
+depends=(
+	'r>=3.6'
+	'r-glue'
+	'r-cli'
+	'r-httr>=0.5'
+	'r-lifecycle>=1.0.3'
+	'r-magrittr'
+	'r-rlang>=1.1.0'
+	'r-selectr'
+	'r-tibble'
+	'r-xml2>=1.3'
+	'r-withr'
+)
+optdepends=(
+	'r-covr'
+	'r-knitr'
+	'r-readr'
+	'r-repurrrsive'
+	'r-rmarkdown'
+	'r-spelling'
+	'r-stringi>=0.3.1'
+	'r-testthat>=3.0.2'
+	'r-webfakes'
+)
 
 source=("https://cran.r-project.org/src/contrib/${_pkgtar}")
-sha256sums=('a465ef7391afaa3c26eebe8c61db02314ac04c4d8de5aa53f090716763d21c1e')
+sha256sums=('7d707c6b2994cf7b6c1d665bec872d2ef5c55f30e7c343c447a8a386a6049ca6')
 
-build(){
-cd "${srcdir}"
-R CMD INSTALL ${_pkgtar} -l ${srcdir}
+build() {
+	cd "${srcdir}"
+	R CMD INSTALL ${_pkgtar} -l ${srcdir}
 }
 package() {
-cd "${scrdir}"
-install -dm0755 "$pkgdir/usr/lib/R/library"
-cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+	cd "${scrdir}"
+	install -dm0755 "$pkgdir/usr/lib/R/library"
+	install -Dm644 ${_cranname}/LICENSE -t "${pkgdir}/usr/share/licenses/$pkgname"
+	cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
 }