[arch-commits] Commit in nextcloud-app-deck/trunk (PKGBUILD)

[David Runge]

    Date: Friday, September 10, 2021 @ 21:34:31
  Author: dvzrv
Revision: 1013900

upgpkg: nextcloud-app-deck 1:1.5.2-1: Upgrade to 1.5.2.

Simplify setting of nextcloud major version dependencies.

Modified:
  nextcloud-app-deck/trunk/PKGBUILD

----------+
 PKGBUILD |   25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-10 21:25:38 UTC (rev 1013899)
+++ PKGBUILD	2021-09-10 21:34:31 UTC (rev 1013900)
@@ -3,7 +3,7 @@
 
 pkgname=nextcloud-app-deck
 _name=deck
-pkgver=1.5.1
+pkgver=1.5.2
 pkgrel=1
 # upstream doesn't adhere to semver:
 # https://github.com/nextcloud/deck/issues/1197
@@ -13,15 +13,22 @@
 url="https://github.com/nextcloud/deck"
 license=('AGPL3')
 groups=('nextcloud-apps')
-depends=('nextcloud>21' 'nextcloud<23')
-makedepends=('ripgrep' 'yq')
+makedepends=('nextcloud' 'ripgrep' 'yq')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/nextcloud-releases/${_name}/releases/download/v${pkgver}/${_name}.tar.gz")
-sha512sums=('a0fc4fcda91f33471c32462894086d5d54d81946a975d4d3b2b839ae1c09698c474d2521584607348fbb77a8aa9ad8500d238adcc7aa4cf607ecf017bd2c77c7')
-b2sums=('78a9d3070f2c0aff1da961cb578e454991f4245485d52c4959aaf8a21f92238e9a3ee649fc80d94186e2214b068430d87b868882d1542376a9a5949650801c19')
+sha512sums=('1164216e9a5ebdce7ce6f979f91f0bad635720ca1f7930fe7df173d5b0e55f22eb48f3cc178261b80dd596770eff3402ed4b3b2ae1e59d55712b93d5ff6f41b5')
+b2sums=('527f16d8a3ea6e32e7133ab11c1455214a915d8e46471e24287d82de3a06f976b0b032288dc2a079016a814696ed0b21aeb7f0d5c3eca3d757e6e55e9b54f465')
 
+_get_nextcloud_versions() {
+  _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' "${_name}/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_major_version="$(xq '.info.dependencies.nextcloud["@max-version"]' "${_name}/appinfo/info.xml"| sed 's/"//g')"
+  _app_max_major_version=$(expr ${_app_max_major_version} + 1)
+}
+
 check() {
-  local _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' "${_name}/appinfo/info.xml"| sed 's/"//g')"
-  local _app_max_major_version="$(xq '.info.dependencies.nextcloud["@max-version"]' "${_name}/appinfo/info.xml"| sed 's/"//g')"
+  local _app_min_major_version
+  local _app_max_major_version
+  _get_nextcloud_versions
+
   local _nextcloud_major_version="$(rg "OC_Version = " /usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)"
   if [[ "$(vercmp "${_nextcloud_major_version}" "${_app_min_major_version}")" -lt 0 ]] || [[ "$(vercmp "${_nextcloud_major_version}" "${_app_max_major_version}")" -gt 0 ]] ; then
     printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is provided.\n" "$pkgname" "${_app_min_major_version}" "${_app_max_major_version}" "${_nextcloud_major_version}"
@@ -30,6 +37,10 @@
 }
 
 package() {
+  _get_nextcloud_versions
+
+  depends=("nextcloud>=${_app_min_major_version}" "nextcloud<${_app_max_major_version}")
+
   install -vdm 755 "${pkgdir}/usr/share/webapps/nextcloud/apps/"
   cp -av "${_name}" "${pkgdir}/usr/share/webapps/nextcloud/apps/"
 }