diff --git a/community/nextcloud28/APKBUILD b/community/nextcloud28/APKBUILD index 8aad519fe79..5918ff8db2c 100644 --- a/community/nextcloud28/APKBUILD +++ b/community/nextcloud28/APKBUILD @@ -1,12 +1,14 @@ # Contributor: Jakub Jirutka # Contributor: Jah Way # Maintainer: Leonardo Arena -pkgname=nextcloud28 _pkgname=nextcloud pkgver=28.0.8 -pkgrel=0 -_replaced_ver=27 -pkgdesc="Transitional package to allow upgrade to version 29" +pkgrel=1 +is_latest=false +_pkgvermaj=${pkgver%%.*} +pkgname=nextcloud$_pkgvermaj +_replaced_ver=$(( _pkgvermaj - 1 )) +pkgdesc="A safe home for all your data" url="https://nextcloud.com/" arch="noarch" license="AGPL-3.0-only" @@ -16,30 +18,30 @@ _php_mods="-bcmath -ctype -curl -dom -gd -fileinfo -gmp -iconv -intl -simplexml -xml -xmlreader -xmlwriter -zip" depends="ca-certificates $_php ${_php_mods//-/$_php-}" makedepends="xmlstarlet" -provides="$pkgname-accessibility=$pkgver-r$pkgrel - $pkgname-bruteforcesettings=$pkgver-r$pkgrel - $pkgname-contactsinteraction=$pkgver-r$pkgrel - $pkgname-cloud_federation_api=$pkgver-r$pkgrel - $pkgname-dav=$pkgver-r$pkgrel - $pkgname-files=$pkgver-r$pkgrel - $pkgname-files_videoplayer=$pkgver-r$pkgrel - $pkgname-federatedfilesharing=$pkgver-r$pkgrel - $pkgname-lookup_server_connector=$pkgver-r$pkgrel - $pkgname-oauth2=$pkgver-r$pkgrel - $pkgname-provisioning_api=$pkgver-r$pkgrel - $pkgname-related_resources=$pkgver-r$pkgrel - $pkgname-settings=$pkgver-r$pkgrel - $pkgname-theming=$pkgver-r$pkgrel - $pkgname-twofactor_totp=$pkgver-r$pkgrel - $pkgname-twofactor_backupcodes=$pkgver-r$pkgrel - $pkgname-viewer=$pkgver-r$pkgrel - $pkgname-workflowengine=$pkgver-r$pkgrel +$is_latest && provides="$_pkgname-accessibility=$pkgver-r$pkgrel + $_pkgname-bruteforcesettings=$pkgver-r$pkgrel + $_pkgname-contactsinteraction=$pkgver-r$pkgrel + $_pkgname-cloud_federation_api=$pkgver-r$pkgrel + $_pkgname-dav=$pkgver-r$pkgrel + $_pkgname-files=$pkgver-r$pkgrel + $_pkgname-files_videoplayer=$pkgver-r$pkgrel + $_pkgname-federatedfilesharing=$pkgver-r$pkgrel + $_pkgname-lookup_server_connector=$pkgver-r$pkgrel + $_pkgname-oauth2=$pkgver-r$pkgrel + $_pkgname-provisioning_api=$pkgver-r$pkgrel + $_pkgname-related_resources=$pkgver-r$pkgrel + $_pkgname-settings=$pkgver-r$pkgrel + $_pkgname-theming=$pkgver-r$pkgrel + $_pkgname-twofactor_totp=$pkgver-r$pkgrel + $_pkgname-twofactor_backupcodes=$pkgver-r$pkgrel + $_pkgname-viewer=$pkgver-r$pkgrel + $_pkgname-workflowengine=$pkgver-r$pkgrel " replaces="nextcloud$_replaced_ver" install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade $pkgname-initscript.post-install" subpackages="$pkgname-doc $pkgname-initscript $pkgname-mysql $pkgname-pgsql $pkgname-sqlite - $pkgname-default-apps:_default_apps" + $pkgname-default-apps:_default_apps $pkgname-occ" source="https://download.nextcloud.com/server/releases/nextcloud-$pkgver.tar.bz2 nextcloud-dont-chmod.patch dont-update-htaccess.patch @@ -60,7 +62,7 @@ pkggroups="www-data" builddir="$srcdir"/$_pkgname # List of bundled apps to separate into subpackages. Keep it in sync! -# Note: Don't add "bruteforcesettings", "contactsinteraction", +# Note: Don't add "accessibility", "bruteforcesettings", "contactsinteraction", # "cloud_federation_api", "files", "dav", # "federatedfilesharing", "lookup_server_connector", "provisioning_api", # "oauth2", "settings", "twofactor_backupcodes", "twofactor_totp", @@ -142,8 +144,8 @@ package() { rm -r ./$wwwdir/config ln -s /$confdir ./$wwwdir/config - mkdir -p ./usr/share/doc/$_pkgname - mv ./$wwwdir/core/doc ./usr/share/doc/$_pkgname/core + mkdir -p ./usr/share/doc/$pkgname + mv ./$wwwdir/core/doc ./usr/share/doc/$pkgname/core install -m 660 -o nextcloud -g www-data \ "$srcdir"/$pkgname-config.php ./$confdir/config.php @@ -163,11 +165,12 @@ package() { doc() { replaces="nextcloud$_replaced_ver-doc" + $is_latest && provides="$_pkgname-doc=$pkgver-r$pkgrel" default_doc local target="$subpkgdir"/usr/share/webapps/$_pkgname/core/doc mkdir -p "${target%/*}" - ln -s ../../../doc/$_pkgname/core "$target" + ln -s ../../../doc/$pkgname/core "$target" install -m644 README.alpine "$subpkgdir"/usr/share/webapps/$_pkgname/README.alpine } @@ -175,6 +178,7 @@ initscript() { pkgdesc="Init script that runs Nextcloud with php-fpm" depends="$pkgname $_php-fpm" replaces="nextcloud$_replaced_ver-initscript" + $is_latest && provides="$_pkgname-initscript=$pkgver-r$pkgrel" local confdir="$subpkgdir/etc/$_php/php-fpm.d" local fpm_name="php-fpm${_php#php}" @@ -191,6 +195,7 @@ pgsql() { pkgdesc="Nextcloud PostgreSQL support" depends="$pkgname $_php-pgsql $_php-pdo_pgsql" replaces="nextcloud$_replaced_ver-pgsql" + $is_latest && provides="$_pkgname-pgsql=$pkgver-r$pkgrel" mkdir -p "$subpkgdir" } @@ -198,6 +203,7 @@ sqlite() { pkgdesc="Nextcloud SQLite support" depends="$pkgname $_php-sqlite3 $_php-pdo_sqlite" replaces="nextcloud$_replaced_ver-sqlite" + $is_latest && provides="$_pkgname-sqlite=$pkgver-r$pkgrel" mkdir -p "$subpkgdir" } @@ -205,15 +211,25 @@ mysql() { pkgdesc="Nextcloud MySQL support" depends="$pkgname $_php-pdo_mysql" replaces="nextcloud$_replaced_ver-mysql" - + $is_latest && provides="$_pkgname-mysql=$pkgver-r$pkgrel" mkdir -p "$subpkgdir" install -m 644 -D "$srcdir"/$pkgname-mysql.cnf "$subpkgdir"/etc/my.cnf.d/$pkgname.cnf } +occ() { + pkgdesc="Nextcloud OCC cmd" + replaces="nextcloud$_replaced_ver-occ" + $is_latest && provides="$_pkgname-occ=$pkgver-r$pkgrel" + mkdir -p "$subpkgdir/usr/share/webapps/$_pkgname" + amove "usr/share/webapps/$_pkgname/occ" + amove "usr/bin/occ" +} + _default_apps() { pkgdesc="Nextcloud default apps" depends="$pkgname" replaces="nextcloud$_replaced_ver-default-apps" + $is_latest && provides="$_pkgname-default-apps=$pkgver-r$pkgrel" local path; for path in "$pkgdir"/"$_appsdir"/*; do if grep -q '' "$path"/appinfo/info.xml; then @@ -237,15 +253,8 @@ _package_app() { local app_deps="" case "$appname" in - dashboard) app_deps="-accessibility" - ;; files_sharing) app_deps="-federatedfilesharing" ;; - photos) - app_deps="-viewer" - provides="$pkgname-gallery=$pkgver-r$pkgrel" - replaces="$replaces nextcloud$_replaced_ver-gallery" - ;; serverinfo) app_deps="-files_sharing" esac diff --git a/community/nextcloud28/nextcloud28.post-upgrade b/community/nextcloud28/nextcloud28.post-upgrade index 898b0ea547b..a246ea81295 100644 --- a/community/nextcloud28/nextcloud28.post-upgrade +++ b/community/nextcloud28/nextcloud28.post-upgrade @@ -54,4 +54,5 @@ fi if [ "${ver_new%-r*}" != "${ver_old%-r*}" ]; then echo ' * Run "occ upgrade" to finish upgrading your NextCloud instance!' >&2 + echo ' * NOTE: since v28.0.8-r1 "occ" command is now in package "nextcloudNN-occ"' >&2 fi