Date: Sunday, May 8, 2022 @ 19:44:52 Author: dvzrv Revision: 1196290 upgpkg: nextcloud-app-spreed 1:14.0.1-1: Rebuild to add more specific dependency on php-interpreter.
Implement a versioned dependency on php-interpreter. Modified: nextcloud-app-spreed/trunk/PKGBUILD ----------+ PKGBUILD | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-05-08 19:44:06 UTC (rev 1196289) +++ PKGBUILD 2022-05-08 19:44:52 UTC (rev 1196290) @@ -2,7 +2,7 @@ _name=spreed pkgname=nextcloud-app-spreed -pkgver=14.0.0 +pkgver=14.0.1 pkgrel=1 epoch=1 pkgdesc="Video & audio-conferencing using WebRTC" @@ -13,8 +13,8 @@ makedepends=(nextcloud) checkdepends=(ripgrep yq) source=(https://github.com/nextcloud-releases/$_name/releases/download/v$pkgver/$_name-v$pkgver.tar.gz) -sha512sums=('209b4d422f2b5b50ceeb5aa59751a65851ade889dbcb2577584fdca11818bd56b531545db85bafc3d0135bd6a94c3d6e5eaf82d864319c693ae5b59dd915835f') -b2sums=('2f8064798ca371dc413055b658e2680890beb11410825ed33592caffc9babc02e1e6541e6ea090cdb966721ec3bcfbec5672ff888253378575954121d215bc24') +sha512sums=('b3467aa5d77900ab8d1a2c302128d06668889212b9598bc455a3ef69fcf5702d4f999df3ac107febe9d6e7b80fd23b3cbec3545e9490238882b329c6a06e3e04') +b2sums=('bb1e05dd2593ec8f78e7c8fcd8aa3ad1e7fe5bf2aeb4f0336744d90969151e61f3cd946a019ff871773d2d678b6e2e260eb7a69736c77e812c8018d1d17a48eb') _get_nextcloud_versions() { _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' "$_name/appinfo/info.xml"| sed 's/"//g')" @@ -27,6 +27,9 @@ _app_min_php="$(xq '.info.dependencies.php["@min-version"]' "$_name/appinfo/info.xml"| sed 's/"//g')" _app_max_php="$(xq '.info.dependencies.php["@max-version"]' "$_name/appinfo/info.xml"| sed 's/"//g')" + if [[ $_app_max_php != 'null' ]]; then + _app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')" + fi _system_php="" for _php in "${_phps[@]}"; do if command -v "$_php" > /dev/null; then @@ -56,12 +59,12 @@ local _php_version="$($_system_php --version |head -n1 |cut -d ' ' -f2 |sed 's/.[0-9]*$//g')" if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then - printf "%s requires php >= %s, but %s is provided\n" $pkgname $_app_min_php $_php_version + printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname $_app_min_php $_php_version exit 1 fi if [[ $_app_max_php != 'null' ]]; then if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then - printf "%s requires php <= %s, but %s is provided\n" $pkgname $_app_min_php $_php_version + printf "%s requires php-interpreter <= %s, but %s is provided\n" $pkgname $_app_min_php $_php_version exit 1 fi fi @@ -77,16 +80,16 @@ ) if [[ "$_app_min_php" != 'null' ]]; then depends+=( - "php>=$_app_min_php" + "php-interpreter>=$_app_min_php" ) fi if [[ "$_app_max_php" != 'null' ]]; then depends+=( - "php<=$_app_max_php" + "php-interpreter<$_app_max_php" ) fi if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then - depends+=(php) + depends+=(php-interpreter) fi install -vdm 755 "$pkgdir/usr/share/webapps/nextcloud/apps/"
