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

[David Runge]

    Date: Thursday, May 5, 2022 @ 22:05:31
  Author: dvzrv
Revision: 1195547

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

Only set an unversioned php requirement in package() if both minimum and
maximum requirement are not set.

Modified:
  nextcloud-app-deck/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-05 22:01:53 UTC (rev 1195546)
+++ PKGBUILD	2022-05-05 22:05:31 UTC (rev 1195547)
@@ -3,7 +3,7 @@
 
 pkgname=nextcloud-app-deck
 _name=deck
-pkgver=1.6.2
+pkgver=1.7.0
 pkgrel=1
 # upstream doesn't adhere to semver:
 # https://github.com/nextcloud/deck/issues/1197
@@ -14,9 +14,9 @@
 license=(AGPL3)
 groups=(nextcloud-apps)
 makedepends=(nextcloud ripgrep yq)
-source=(https://github.com/nextcloud/$_name/releases/download/v$pkgver/$_name.tar.gz)
-sha512sums=('8ea6e35fe5bce13971b3d82e4e8d655e1644c062240721d1ce8e71cd388887c952bc943a90578a402271532dab2503a17317092aacfa2a719996f43413c181e5')
-b2sums=('a89ae7e0e7cca5de63c02f73f3238f6630329613be25013f147aabce3279f7d493dc55476770d5ea47daf747e4813f7c39c4068c2ab57985646e6fb487d6ad47')
+source=($_name-$pkgver.tar.gz::https://github.com/nextcloud/$_name/releases/download/v$pkgver/$_name.tar.gz)
+sha512sums=('cf8a74e6469be2bf143ce4a3e4065384c014080b996f9e4877333a308ce7c29af43502399e88be824ca37aeb85b208d149c3425dda7ea7445f7f1a2f660bff54')
+b2sums=('586dbaf964fd9b14115b0042f79347fd527e15c7faaf01b2e90e0bc40136e42598a8dc3b701fe09aecdf8047de9ab7c0e229ddc0246610768612d5b99400d89b')
 
 _get_nextcloud_versions() {
   _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' "${_name}/appinfo/info.xml"| sed 's/"//g')"
@@ -61,13 +61,20 @@
   depends=(
     "nextcloud>=$_app_min_major_version"
     "nextcloud<$_app_max_major_version"
-    "php>=$_app_min_php"
   )
+  if [[ "$_app_min_php" != 'null' ]]; then
+    depends+=(
+      "php>=$_app_min_php"
+    )
+  fi
   if [[ "$_app_max_php" != 'null' ]]; then
     depends+=(
       "php<=$_app_max_php"
     )
   fi
+  if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then
+    depends+=(php)
+  fi
 
   install -vdm 755 "${pkgdir}/usr/share/webapps/nextcloud/apps/"
   cp -av "${_name}" "${pkgdir}/usr/share/webapps/nextcloud/apps/"