Update to 19.0.13; Fixes RHBZ#1981503; Fixes RHBZ#1981505

Without this package, occ refuse to work. 
# php /usr/share/nextcloud/occ
The posix extensions are required - see http://php.net/manual/en/book.posix.php

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1,5 +1,3 @@
-/nextcloud-10.0.3.tar.bz2
+/nextcloud-*.tar.bz2
-/nextcloud-10.0.4.tar.bz2
+/nextcloud
-/nextcloud-18.0.0.tar.bz2
+*.pkgtmp
-/nextcloud-18.0.4.tar.bz2
-/nextcloud-19.0.0.tar.bz2

0000-disable-update-version-check.patch

@@ -0,0 +1,20 @@
+diff -Naur a/lib/private/Updater.php b/lib/private/Updater.php
+--- a/lib/private/Updater.php	2020-10-24 10:37:44.000000000 +0200
++++ b/lib/private/Updater.php	2020-11-10 10:51:10.511861549 +0100
+@@ -197,14 +197,11 @@
+ 		}
+ 
+ 		if ($currentVendor === 'nextcloud') {
+-			return isset($allowedPreviousVersions[$currentVendor][$majorMinor])
+-				&& (version_compare($oldVersion, $newVersion, '<=') ||
+-					$this->config->getSystemValue('debug', false));
++			return true;
+ 		}
+ 
+ 		// Check if the instance can be migrated
+-		return isset($allowedPreviousVersions[$currentVendor][$majorMinor]) ||
+-			isset($allowedPreviousVersions[$currentVendor][$oldVersion]);
++		return true;
+ 	}
+ 
+ 	/**

0001-mangle-shebang.patch

@@ -0,0 +1,9 @@
+diff -Naur a/occ b/occ
+--- a/occ	2020-10-24 10:37:44.000000000 +0200
++++ b/occ	2020-11-10 19:39:56.523178958 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+ /**
+  * Copyright (c) 2013 Thomas Müller <thomas.mueller@tmit.eu>

README.md

@@ -0,0 +1,11 @@
+### Installation, setup & updating
+
+Nextcloud requires some additional steps after installation/upgrade that are not part of the package update process. After installation/update, visiting your install's website will automatically trigger the internal Nextcloud updater which will take care of these steps. For more details, see this package's documentation files.
+
+### Other versions
+
+Nextcloud maintains multiple stable branches at the same time. To install those, check out the [modular nextcloud package](https://src.fedoraproject.org/modules/nextcloud).
+
+### CentOS/RHEL
+
+For CentOS/RHEL 8+, nextcloud is available through the [modular repository](https://src.fedoraproject.org/modules/nextcloud). Due to incompatible PHP versions, nextcloud is no longer available for CentOS/RHEL 7 or older.

changelog

@@ -0,0 +1,106 @@
+* Wed Jun 30 2021 Christopher Engelhard <ce@lcts.de> - 19.0.12-1
+- Update to Nextcloud 19.0.12, fixes CVE-2021-22915 (RHBZ 1977202)
+- Include php-fpm config in httpd subpackage
+- Set php memory limit to 512MB (RHBZ 1933529)
+- Add Referrer-policy no-referrer to nginx config (RHBZ 1933530)
+
+* Sun Feb 28 2021 Christopher Engelhard <ce@lcts.de> - 19.0.9-1
+- Update to Nextcloud 19.0.9
+
+* Sat Feb 20 2021 Christopher Engelhard <ce@lcts.de> - 19.0.8-1
+- Update to Nextcloud 19.0.8
+
+* Sat Jan 16 2021 Christopher Engelhard <ce@lcts.de> - 19.0.7-1
+- Update to Nextcloud 19.0.7
+
+* Mon Dec 28 2020 Christopher Engelhard <ce@lcts.de> - 19.0.6-2
+- Remove syslinuc rules, these are part of system policy now
+- Remove duplicate dependencies
+- Add dependency on CA cert bundle
+- Add Provides: for bundled libraries
+
+* Thu Dec 10 2020 Christopher Engelhard <ce@lcts.de> - 19.0.6-1
+- Update to Nextcloud 19.0.6
+
+* Thu Nov 19 2020 Christopher Engelhard <ce@lcts.de> - 19.0.5-1
+- Update to Nextcloud 19.0.5
+
+* Wed Nov 11 2020 Christopher Engelhard <ce@lcts.de> - 19.0.3-2
+- Add dependencies on php-cli (for occ) and php-process (for posix)
+- Remove unneeded BR on php-cli
+- Add patch to allow updates across more than one major version
+- Remove CentOS/RHEL 7 support
+
+* Sun Oct 11 2020 Christopher Engelhard <ce@lcts.de> - 19.0.3-1
+- Update to Nextcloud 19.0.3
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 19.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun Jun 28 2020 Ivan Chavero <ichavero@redhat.com> - 19.0.0-1
+- Update to Nextcloud 19.0.0
+- Update licenses
+
+* Thu Apr 30 2020 Ivan Chavero <ichavero@redhat.com> - 18.0.4-1
+- Update to Nextcloud 18.0.4
+
+* Sat Feb 08 2020 Ivan Chavero <ichavero@redhat.com> - 18.0.0-1
+- Refactor spec file
+- Update to Nextcoud 18.0.0
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.4-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.4-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Jan  9 2019 Remi Collet <remi@remirepo.net> - 10.0.4-6
+- drop dependency on php-password-compat #1658730
+- allow php-smbclient 1.0.0 #1663672
+- allow doctrine/dbal 2.x
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Mar 25 2017 Shawn Iwinski <shawn.iwinski@gmail.com> - 10.0.4-2
+- Add max versions to dependencies to limit each to 1 major version
+- Update some dependencies to use php-composer(*) instead of package names
+- Prepare for php-composer(google/apiclient) version 2 and new version 1 package
+
+* Tue Feb 28 2017 James Hogarth <james.hogarth@gmail.com> - 10.0.4-1
+- update to 10.0.4
+- Add migration from owncloud documentation
+- Add systemd timer for background jobs
+
+* Wed Feb 08 2017 James Hogarth <james.hogarth@gmail.com> - 10.0.3-1
+- update to 10.0.3
+
+* Thu Oct 06 2016 James Hogarth <james.hogarth@gmail.com> - 10.0.1-1
+- update to 10.0.1
+
+* Mon Aug 01 2016 James Hogarth <james.hogarth@gmail.com> - 9.0.53-5
+- Use lua to have a common srpm between epel7 and fedora
+
+* Fri Jul 29 2016 James Hogarth <james.hogarth@gmail.com> - 9.0.53-4
+- Don't unbundle javascript on EPEL7 due to versioning issues
+
+* Fri Jul 29 2016 James Hogarth <james.hogarth@gmail.com> - 9.0.53-3
+- Unbundle javascript libraries from core where possible
+
+* Tue Jul 26 2016 James Hogarth <james.hogarth@gmail.com> - 9.0.53-2
+- Update the autoloader to use the path from the approved package
+
+* Tue Jul 19 2016 James Hogarth <james.hogarth@gmail.com> - 9.0.53-1
+- New release 9.0.53
+
+* Thu Jul 14 2016 James Hogarth <james.hogarth@gmail.com> - 9.0.52-1
+- Initial nextcloud build

gating.yml

@@ -0,0 +1,9 @@
+--- !Policy
+product_versions:
+  - fedora-*
+    decision_context:
+      - bodhi_update_push_testing
+      - bodhi_update_push_stable
+    subject_type: koji_build
+    rules:
+      - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

nextcloud-default-nginx.conf

@@ -12,6 +12,7 @@
         add_header X-Robots-Tag none;
         add_header X-Download-Options noopen;
         add_header X-Permitted-Cross-Domain-Policies none;
+        add_header Referrer-Policy no-referrer always;
 
 
         # set max upload size

nextcloud-el7-php-fpm.conf

@@ -1,24 +0,0 @@
-[nextcloud]
-user = apache
-group = apache
-listen = /run/php-fpm/nextcloud.sock
-listen.allowed_clients = 127.0.0.1
-pm = dynamic
-pm.max_children = 50
-pm.start_servers = 5
-pm.min_spare_servers = 5
-pm.max_spare_servers = 35
-slowlog = /var/log/php-fpm/nextcloud-slow.log
-php_admin_value[error_log] = /var/log/php-fpm/nextcloud-error.log
-php_admin_flag[log_errors] = on
-php_value[session.save_handler] = files
-php_value[session.save_path]    = /var/lib/php/session
-php_value[soap.wsdl_cache_dir]  = /var/lib/php/wsdlcache
-php_value[upload_max_filesize] = 10G
-php_value[post_max_size] = 10G
-env[HOSTNAME] = $HOSTNAME
-env[PATH] = /usr/local/bin:/usr/bin:/bin
-env[TMP] = /tmp
-env[TMPDIR] = /tmp
-env[TEMP] = /tmp
-

nextcloud-php-fpm.conf

@@ -15,6 +15,7 @@ php_admin_flag[log_errors] = on
 php_value[session.save_handler] = files
 php_value[session.save_path]    = /var/lib/php/session
 php_value[soap.wsdl_cache_dir]  = /var/lib/php/wsdlcache
+php_value[memory_limit] = 512M
 php_value[upload_max_filesize] = 10G
 php_value[post_max_size] = 10G
 env[HOSTNAME] = $HOSTNAME

nextcloud.spec

@@ -1,58 +1,55 @@
 Name:           nextcloud
-Version:        19.0.0
+Version:        19.0.13
-Release:        2%{?dist}
+Release:        %autorelease
 Summary:        Private file sync and share server
-
 License:        AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe
 URL:            http://nextcloud.com
-
 Source0:        https://download.nextcloud.com/server/releases/%{name}-%{version}.tar.bz2
 
-Source1:        %{name}-httpd.conf
+# basic nextcloud config.php, nextcloud's
-Source2:        %{name}-access-httpd.conf.avail
-
-Source200:        %{name}-default-nginx.conf
-Source201:        %{name}-conf-nginx.conf
-Source202:        %{name}-php-fpm.conf
-Source203:        %{name}-el7-php-fpm.conf
-
-# Config snippets
-Source100:      %{name}-auth-any.inc
-Source101:      %{name}-auth-local.inc
-Source102:      %{name}-auth-none.inc
-Source103:      %{name}-defaults.inc
-# packaging notes and doc
-Source3:        %{name}-README.fedora
-Source4:        %{name}-mysql.txt
-Source5:        %{name}-postgresql.txt
-Source6:        %{name}-MIGRATION.fedora
-# config.php containing just settings we want to specify, nextcloud's
 # initial setup will fill out other settings appropriately
-Source7:        %{name}-config.php
+Source1:        %{name}-config.php
-
-# Our autoloader for core
-Source8:        %{name}-fedora-autoloader.php
-
 # Systemd timer for background jobs
-Source10:       %{name}-systemd-timer.service
+Source2:        %{name}-systemd-timer.service
-Source11:       %{name}-systemd-timer.timer
+Source3:        %{name}-systemd-timer.timer
+# httpd config files
+Source100:      %{name}-httpd.conf
+Source101:      %{name}-access-httpd.conf.avail
+Source102:      %{name}-auth-any.inc
+Source103:      %{name}-auth-local.inc
+Source104:      %{name}-auth-none.inc
+Source105:      %{name}-defaults.inc
+# nginx/php-fpm config files
+Source200:      %{name}-default-nginx.conf
+Source201:      %{name}-conf-nginx.conf
+Source202:      %{name}-php-fpm.conf
+# packaging notes and doc
+Source300:      %{name}-README.fedora
+Source301:      %{name}-mysql.txt
+Source302:      %{name}-postgresql.txt
+Source303:      %{name}-MIGRATION.fedora
+
+# Remove updater version check, we know that updates across more than one
+# version are possible
+Patch0:         0000-disable-update-version-check.patch
+# Change occ shebang to /usr/bin/php
+Patch1:         0001-mangle-shebang.patch
 
 BuildArch:      noarch
-
 # For the systemd macros
-%{?systemd_requires}
+%if 0%{?fedora} > 29
+BuildRequires:  systemd-rpm-macros
+%else
 BuildRequires:  systemd
-
+%endif
 # expand pear macros on install
 BuildRequires:  php-pear
 
-# For sanity %%check
+# Require one webserver and database backend
-BuildRequires:       php-cli
-
-
 Requires:       %{name}-webserver = %{version}-%{release}
 Requires:       %{name}-database = %{version}-%{release}
-
+# Require php CLI for occ command
+Requires:       php-cli
 # Core PHP libs/extensions required by OC core
 Requires:       php-curl
 Requires:       php-dom
@@ -72,21 +69,122 @@ Requires:       php-xmlwriter
 Requires:       php-spl
 Requires:       php-zip
 Requires:       php-filter
-Requires:       php-mysqlnd
-Requires:       php-pgsql
 Requires:       php-ldap
 Requires:       php-smbclient
 Requires:       php-imap
 Requires:       php-gmp
+Requires:       php-process
 Requires:       php-pecl-imagick
 Requires:       php-pecl-memcached
 Requires:       php-pecl-apcu
 Requires:       php-pecl-redis5
+# For systemd support during install/uninstall
+%{?systemd_requires}
+# the CA cert bundle is linked to from the config dir
+Requires:       %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
 
-
+# Bundled composer libraries
-# Need to label the httpd rw stuff correctly until base selinux policy updated
+# many of these can be unbundled
-Requires(post):   %{_sbindir}/semanage
+Provides:       bundled(php-composer(icewind/smb)) = 3.2.7
-Requires(postun): %{_sbindir}/semanage
+Provides:       bundled(php-composer(icewind/streams)) = 0.7.1
+Provides:       bundled(php-composer(aws/aws-sdk-php)) = 3.133.27
+Provides:       bundled(php-composer(bantu/ini-get-wrapper)) = 1.0.1
+Provides:       bundled(php-composer(beberlei/assert)) = 3.2.7
+Provides:       bundled(php-composer(christophwurst/id3parser)) = 0.1.1
+Provides:       bundled(php-composer(deepdiver/zipstreamer)) = 1.1.1
+Provides:       bundled(php-composer(deepdiver1975/tarstreamer)) = 2.0.0
+Provides:       bundled(php-composer(doctrine/annotations)) = 1.6.0
+Provides:       bundled(php-composer(doctrine/cache)) = 1.8.0
+Provides:       bundled(php-composer(doctrine/collections)) = 1.5.0
+Provides:       bundled(php-composer(doctrine/common)) = 2.10.0
+Provides:       bundled(php-composer(doctrine/dbal)) = 2.9.2
+Provides:       bundled(php-composer(doctrine/event-manager)) = 1.0.0
+Provides:       bundled(php-composer(doctrine/inflector)) = 1.3.0
+Provides:       bundled(php-composer(doctrine/lexer)) = 1.2.0
+Provides:       bundled(php-composer(doctrine/persistence)) = 1.1.0
+Provides:       bundled(php-composer(doctrine/reflection)) = 1.0.0
+Provides:       bundled(php-composer(egulias/email-validator)) = 2.1.11
+Provides:       bundled(php-composer(fgrosse/phpasn1)) = 2.1.1
+Provides:       bundled(php-composer(guzzlehttp/guzzle)) = 6.5.2
+Provides:       bundled(php-composer(guzzlehttp/promises)) = 1.3.1
+Provides:       bundled(php-composer(guzzlehttp/psr7)) = 1.6.1
+Provides:       bundled(php-composer(guzzlehttp/ringphp)) = 1.1.0
+Provides:       bundled(php-composer(guzzlehttp/streams)) = 3.0.0
+Provides:       bundled(php-composer(icewind/searchdav)) = 2.0.0
+Provides:       bundled(php-composer(icewind/streams)) = 0.7.1
+Provides:       bundled(php-composer(interfasys/lognormalizer)) = 1.0
+Provides:       bundled(php-composer(jeremeamia/SuperClosure)) = 2.4.0
+Provides:       bundled(php-composer(justinrainbow/json-schema)) = 5.2.9
+Provides:       bundled(php-composer(league/flysystem)) = 1.0.64
+Provides:       bundled(php-composer(league/uri)) = 6.2.1
+Provides:       bundled(php-composer(league/uri-components)) = 2.2.1
+Provides:       bundled(php-composer(league/uri-interfaces)) = 2.1.0
+Provides:       bundled(php-composer(microsoft/azure-storage-blob)) = 1.5.0
+Provides:       bundled(php-composer(microsoft/azure-storage-common)) = 1.4.1
+Provides:       bundled(php-composer(mtdowling/jmespath.php)) = 2.5.0
+Provides:       bundled(php-composer(nikic/php-parser)) = 4.3.0
+Provides:       bundled(php-composer(paragonie/random_compat)) = 9.99.99
+Provides:       bundled(php-composer(patchwork/jsqueeze)) = 2.0.5
+Provides:       bundled(php-composer(patchwork/utf8)) = 1.3.1
+Provides:       bundled(php-composer(pear/archive_tar)) = 1.4.9
+Provides:       bundled(php-composer(pear/console_getopt)) = 1.4.3
+Provides:       bundled(php-composer(pear/pear-core-minimal)) = 1.10.10
+Provides:       bundled(php-composer(pear/pear_exception)) = 1.0.1
+Provides:       bundled(php-composer(php-http/guzzle6-adapter)) = 2.0.1
+Provides:       bundled(php-composer(php-http/httplug)) = 2.1.0
+Provides:       bundled(php-composer(php-http/promise)) = 1.0.0
+Provides:       bundled(php-composer(php-opencloud/openstack)) = 3.0.7
+Provides:       bundled(php-composer(phpseclib/phpseclib)) = 2.0.25
+Provides:       bundled(php-composer(pimple/pimple)) = 3.2.3
+Provides:       bundled(php-composer(psr/container)) = 1.0.0
+Provides:       bundled(php-composer(psr/http-client)) = 1.0.0
+Provides:       bundled(php-composer(psr/http-factory)) = 1.0.1
+Provides:       bundled(php-composer(psr/http-message)) = 1.0.1
+Provides:       bundled(php-composer(psr/log)) = 1.1.0
+Provides:       bundled(php-composer(punic/punic)) = 1.6.5
+Provides:       bundled(php-composer(ralouphie/getallheaders)) = 3.0.3
+Provides:       bundled(php-composer(ramsey/uuid)) = 3.9.3
+Provides:       bundled(php-composer(react/promise)) = 2.2.1
+Provides:       bundled(php-composer(sabre/dav)) = 4.0.3
+Provides:       bundled(php-composer(sabre/event)) = 5.1.0
+Provides:       bundled(php-composer(sabre/http)) = 5.1.0
+Provides:       bundled(php-composer(sabre/uri)) = 2.2.0
+Provides:       bundled(php-composer(sabre/vobject)) = 4.3.0
+Provides:       bundled(php-composer(sabre/xml)) = 2.2.3
+Provides:       bundled(php-composer(scssphp/scssphp)) = 1.0.3
+Provides:       bundled(php-composer(spomky-labs/base64url)) = 2.0.1
+Provides:       bundled(php-composer(spomky-labs/cbor-php)) = 1.0.8
+Provides:       bundled(php-composer(stecman/symfony-console-completion)) = 0.11.0
+Provides:       bundled(php-composer(swiftmailer/swiftmailer)) = 6.2.3
+Provides:       bundled(php-composer(symfony/console)) = 4.4.4
+Provides:       bundled(php-composer(symfony/event-dispatcher)) = 4.4.4
+Provides:       bundled(php-composer(symfony/event-dispatcher-contracts)) = 1.1.7
+Provides:       bundled(php-composer(symfony/polyfill-ctype)) = 1.15.0
+Provides:       bundled(php-composer(symfony/polyfill-iconv)) = 1.12.0
+Provides:       bundled(php-composer(symfony/polyfill-intl-idn)) = 1.12.0
+Provides:       bundled(php-composer(symfony/polyfill-mbstring)) = 1.14.0
+Provides:       bundled(php-composer(symfony/polyfill-php56)) = 1.10.0
+Provides:       bundled(php-composer(symfony/polyfill-php72)) = 1.12.0
+Provides:       bundled(php-composer(symfony/polyfill-php73)) = 1.13.1
+Provides:       bundled(php-composer(symfony/polyfill-util)) = 1.10.0
+Provides:       bundled(php-composer(symfony/process)) = 4.4.4
+Provides:       bundled(php-composer(symfony/routing)) = 4.4.4
+Provides:       bundled(php-composer(symfony/service-contracts)) = 1.1.8
+Provides:       bundled(php-composer(symfony/translation)) = 4.4.4
+Provides:       bundled(php-composer(symfony/translation-contracts)) = 1.1.7
+Provides:       bundled(php-composer(web-auth/cose-lib)) = 3.1.1
+Provides:       bundled(php-composer(web-auth/metadata-service)) = 3.1.1
+Provides:       bundled(php-composer(web-auth/webauthn-lib)) = 3.1.1
+Provides:       bundled(php-composer(doctrine/cache)) = 1.7.1
+Provides:       bundled(php-composer(doctrine/event-manager)) = 1.0.0
+# OpenIconic icons bundled via sabre-dav
+Provides:       bundled(openiconic-fonts) = 1.0.0
+# jscolor bundled via themeing app
+Provides:       bundled(jscolor) = 2.0.4
+# jquery-ui-multiselect bundled via user_ldap app
+Provides:       bundled(jquery-ui-multiselect) = 0.3.1
+# zxcvbn bundled via core
+Provides:       bundled(zxcvbn) = 4.4.2
 
 %description
 NextCloud gives you universal access to your files through a web interface or
@@ -97,39 +195,33 @@ applications and plugins.
 
 
 %package httpd
-Summary:    Httpd integration for NextCloud
+Summary:        Httpd integration for NextCloud
-
+Provides:       %{name}-webserver = %{version}-%{release}
-Provides:   %{name}-webserver = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
-Requires:   %{name} = %{version}-%{release}
-
 # PHP dependencies
-Requires:       php
+Requires:       php-fpm httpd
 
 %description httpd
 %{summary}.
 
 
 %package nginx
-Summary:    Nginx integration for NextCloud
+Summary:        Nginx integration for NextCloud
-
+Provides:       %{name}-webserver = %{version}-%{release}
-Provides:   %{name}-webserver = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
-Requires:   %{name} = %{version}-%{release}
-
 # PHP dependencies
-Requires:   php-fpm nginx
+Requires:       php-fpm nginx
 
 %description nginx
 %{summary}.
 
 
 %package mysql
-Summary:    MySQL database support for NextCloud
+Summary:        MySQL database support for NextCloud
-
+Provides:       %{name}-database = %{version}-%{release}
-Provides:   %{name}-database = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
-Requires:   %{name} = %{version}-%{release}
-
 # From getSupportedDatabases, mysql => pdo, mysql
-Requires:   php-mysqlnd
+Requires:       php-mysqlnd
 
 %description mysql
 This package ensures the necessary dependencies are in place for NextCloud to
@@ -142,13 +234,11 @@ also install and enable a MySQL / MariaDB server package. See README.mysql for
 more details.
 
 %package postgresql
-Summary:    PostgreSQL database support for NextCloud
+Summary:        PostgreSQL database support for NextCloud
-
+Provides:       %{name}-database = %{version}-%{release}
-Provides:   %{name}-database = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
-Requires:   %{name} = %{version}-%{release}
-
 # From getSupportedDatabases, pgsql => function, pg_connect
-Requires:   php-pgsql
+Requires:       php-pgsql
 
 %description postgresql
 This package ensures the necessary dependencies are in place for NextCloud to
@@ -162,12 +252,10 @@ for more details.
 
 
 %package sqlite
-Summary:    SQLite 3 database support for NextCloud
+Summary:        SQLite 3 database support for NextCloud
-
+Provides:       %{name}-database = %{version}-%{release}
-Provides:   %{name}-database = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
-Requires:   %{name} = %{version}-%{release}
 # From getSupportedDatabases, pgsql => class, SQLite3
-
 %description sqlite
 This package ensures the necessary dependencies are in place for NextCloud to
 work with an SQLite 3 database stored on the local system.
@@ -182,150 +270,148 @@ find . -name .gitignore -type f        -exec rm    {} \; -print
 find . -name .github    -type d -prune -exec rm -r {} \; -print
 
 # prepare package doc
-cp %{SOURCE3} README.fedora
+cp %{SOURCE300} README.fedora
-cp %{SOURCE4} README.mysql
+cp %{SOURCE301} README.mysql
-cp %{SOURCE5} README.postgresql
+cp %{SOURCE302} README.postgresql
-cp %{SOURCE6} MIGRATION.fedora
+cp %{SOURCE303} MIGRATION.fedora
 
 # Locate license files and put them sensibly in place
-mv apps/files_pdfviewer/vendor/pdfjs/LICENSE js-pdfjs-LICENSE
+# find all using "find -name '*LICENSE*' -o -name '*COPYING*' | sort"
-mv apps/files_pdfviewer/vendor/pdfjs/web/cmaps/LICENSE js-pdfjs-cmaps-LICENSE
+mv 3rdparty/aws/aws-sdk-php/LICENSE.md aws-LICENSE.md
-mv apps/notifications/COPYING notifications-LICENSE
-mv apps/password_policy/LICENSE password_policy-LICENSE
-mv apps/serverinfo/COPYING serverinfo-LICENSE
-mv apps/survey_client/COPYING survey_client-LICENSE
-mv apps/user_ldap/vendor/ui-multiselect/MIT-LICENSE js-jqueryui-multiselect-LICENSE
-mv COPYING nextcloud-LICENSE
-
-
-mv core/vendor/zxcvbn/LICENSE.txt zxcvbn-LICENSE
-mv core/fonts/LICENSE_OFL.txt fonts-LICENSE
-mv lib/composer/composer/LICENSE composer-LICENSE
-mv 3rdparty/sabre/vobject/LICENSE sabre-LICENSE
-mv 3rdparty/sabre/dav/LICENSE sabre-LICENSE
-mv 3rdparty/sabre/dav/lib/DAV/Browser/assets/openiconic/ICON-LICENSE sabre-ICON-LICENSE
-mv 3rdparty/sabre/event/LICENSE sabre-LICENSE
-mv 3rdparty/sabre/http/LICENSE sabre-LICENSE
-mv 3rdparty/sabre/xml/LICENSE sabre-LICENSE
-mv 3rdparty/sabre/uri/LICENSE sabre-LICENSE
-mv 3rdparty/nikic/php-parser/LICENSE nikic-LICENSE
 mv 3rdparty/bantu/ini-get-wrapper/LICENSE bantu-LICENSE
-mv '3rdparty/LICENSE INFO' 3rdparty-LICENSE_INFO
+mv 3rdparty/beberlei/assert/LICENSE beberlei-LICENSE
-mv 3rdparty/egulias/email-validator/LICENSE egulias-LICENSE
+mv 3rdparty/christophwurst/id3parser/LICENSE christophwurst-LICENSE
-mv 3rdparty/stecman/symfony-console-completion/LICENCE stecman-LICENCE
+mv 3rdparty/composer/LICENSE composer-LICENSE
-mv 3rdparty/jeremeamia/SuperClosure/LICENSE.md jeremeamia-LICENSE
+mv 3rdparty/deepdiver1975/tarstreamer/LICENSE deepdiver1975-LICENSE
-mv 3rdparty/microsoft/azure-storage-blob/LICENSE microsoft-LICENSE
+mv 3rdparty/deepdiver/zipstreamer/COPYING deepdiver-COPYING
-mv 3rdparty/microsoft/azure-storage-common/LICENSE microsoft-LICENSE
+mv 3rdparty/doctrine/annotations/LICENSE doctrine-LICENSE
-mv 3rdparty/justinrainbow/json-schema/LICENSE justinrainbow-LICENSE
+mv 3rdparty/doctrine/cache/LICENSE doctrine-LICENSE
 mv 3rdparty/doctrine/collections/LICENSE doctrine-LICENSE
-mv 3rdparty/doctrine/event-manager/LICENSE doctrine-LICENSE
 mv 3rdparty/doctrine/common/LICENSE doctrine-LICENSE
+mv 3rdparty/doctrine/dbal/LICENSE doctrine-LICENSE
+mv 3rdparty/doctrine/event-manager/LICENSE doctrine-LICENSE
+mv 3rdparty/doctrine/inflector/LICENSE doctrine-LICENSE
 mv 3rdparty/doctrine/persistence/LICENSE doctrine-LICENSE
 mv 3rdparty/doctrine/reflection/LICENSE doctrine-LICENSE
-mv 3rdparty/doctrine/inflector/LICENSE doctrine-LICENSE
+mv 3rdparty/egulias/email-validator/LICENSE egulias-LICENSE
-mv 3rdparty/doctrine/cache/LICENSE doctrine-LICENSE
+mv 3rdparty/fgrosse/phpasn1/LICENSE fgrosse-LICENSE
-mv 3rdparty/doctrine/dbal/LICENSE doctrine-LICENSE
-mv 3rdparty/doctrine/annotations/LICENSE doctrine-LICENSE
-mv 3rdparty/deepdiver/zipstreamer/COPYING deepdiver-COPYING
-mv 3rdparty/mtdowling/jmespath.php/LICENSE mtdowling-LICENSE
-mv 3rdparty/punic/punic/LICENSE.txt punic-LICENSE.txt
-mv 3rdparty/punic/punic/UNICODE-LICENSE.txt punic-UNICODE-LICENSE
-mv 3rdparty/christophwurst/id3parser/LICENSE christophwurst-LICENSE
-mv 3rdparty/symfony/event-dispatcher-contracts/LICENSE symfony-LICENSE
-mv 3rdparty/symfony/process/LICENSE symfony-LICENSE
-mv 3rdparty/symfony/event-dispatcher/LICENSE symfony-LICENSE
-mv 3rdparty/symfony/polyfill-php56/LICENSE symfony-LICENSE
-mv 3rdparty/symfony/routing/LICENSE symfony-LICENSE
-mv 3rdparty/symfony/polyfill-intl-idn/LICENSE symfony-LICENSE
-mv 3rdparty/symfony/polyfill-iconv/LICENSE symfony-LICENSE
-mv 3rdparty/symfony/polyfill-mbstring/LICENSE symfony-LICENSE
-mv 3rdparty/symfony/polyfill-php72/LICENSE symfony-LICENSE
-mv 3rdparty/symfony/translation/LICENSE symfony-LICENSE
-mv 3rdparty/symfony/console/LICENSE symfony-LICENSE
-mv 3rdparty/symfony/polyfill-php73/LICENSE symfony-LICENSE
-mv 3rdparty/symfony/translation-contracts/LICENSE symfony-LICENSE
-mv 3rdparty/symfony/service-contracts/LICENSE symfony-LICENSE
-mv 3rdparty/symfony/polyfill-util/LICENSE symfony-LICENSE
-mv 3rdparty/react/promise/LICENSE react-LICENSE
-mv 3rdparty/composer/LICENSE composer-LICENSE
-mv 3rdparty/icewind/searchdav/LICENSE icewind-LICENSE
-mv 3rdparty/aws/aws-sdk-php/LICENSE.md aws-LICENSE.md
-mv 3rdparty/interfasys/lognormalizer/COPYING interfasys-COPYING
-mv 3rdparty/php-opencloud/openstack/LICENSE php-opencloud-LICENSE
-mv 3rdparty/league/flysystem/LICENSE league-LICENSE
-mv 3rdparty/phpseclib/phpseclib/LICENSE phpseclib-LICENSE
-mv 3rdparty/deepdiver1975/tarstreamer/LICENSE deepdiver1975-LICENSE
-mv 3rdparty/patchwork/jsqueeze/LICENSE.GPLv2 patchwork-LICENSE
-mv 3rdparty/patchwork/jsqueeze/LICENSE.ASL20 patchwork-LICENSE
-mv 3rdparty/patchwork/utf8/LICENSE-GPL patchwork-LICENSE-GPL
-mv 3rdparty/patchwork/utf8/LICENSE-APACHE patchwork-LICENSE-APACHE
-mv 3rdparty/guzzlehttp/streams/LICENSE guzzlehttp-LICENSE
 mv 3rdparty/guzzlehttp/guzzle/LICENSE guzzlehttp-LICENSE
 mv 3rdparty/guzzlehttp/promises/LICENSE guzzlehttp-LICENSE
-mv 3rdparty/guzzlehttp/ringphp/LICENSE guzzlehttp-LICENSE
 mv 3rdparty/guzzlehttp/psr7/LICENSE guzzlehttp-LICENSE
-mv 3rdparty/pear/pear_exception/LICENSE pear-LICENSE
+mv 3rdparty/guzzlehttp/ringphp/LICENSE guzzlehttp-LICENSE
+mv 3rdparty/guzzlehttp/streams/LICENSE guzzlehttp-LICENSE
+mv 3rdparty/icewind/searchdav/LICENSE icewind-LICENSE
+mv 3rdparty/interfasys/lognormalizer/COPYING interfasys-COPYING
+mv 3rdparty/jeremeamia/SuperClosure/LICENSE.md jeremeamia-LICENSE
+mv 3rdparty/justinrainbow/json-schema/LICENSE justinrainbow-LICENSE
+mv 3rdparty/league/flysystem/LICENSE league-LICENSE
+mv 3rdparty/league/uri-components/LICENSE league-LICENSE
+mv 3rdparty/league/uri-interfaces/LICENSE league-LICENSE
+mv 3rdparty/league/uri/LICENSE league-LICENSE
+mv '3rdparty/LICENSE INFO' 3rdparty-LICENSE_INFO
+mv 3rdparty/microsoft/azure-storage-blob/LICENSE microsoft-LICENSE
+mv 3rdparty/microsoft/azure-storage-common/LICENSE microsoft-LICENSE
+mv 3rdparty/mtdowling/jmespath.php/LICENSE mtdowling-LICENSE
+mv 3rdparty/nikic/php-parser/LICENSE nikic-LICENSE
+mv 3rdparty/paragonie/random_compat/LICENSE paragonie-LICENSE
+mv 3rdparty/patchwork/jsqueeze/LICENSE.ASL20 patchwork-LICENSE-APACHE
+mv 3rdparty/patchwork/jsqueeze/LICENSE.GPLv2 patchwork-LICENSE-GPL
+mv 3rdparty/patchwork/utf8/LICENSE-APACHE patchwork-LICENSE-APACHE
+mv 3rdparty/patchwork/utf8/LICENSE-GPL patchwork-LICENSE-GPL
 mv 3rdparty/pear/console_getopt/LICENSE pear-LICENSE
-mv 3rdparty/ralouphie/getallheaders/LICENSE ralouphie-LICENSE
+mv 3rdparty/pear/pear_exception/LICENSE pear-LICENSE
-mv 3rdparty/psr/log/LICENSE psr-LICENSE
+mv 3rdparty/php-http/guzzle6-adapter/LICENSE php-http-LICENSE
-mv 3rdparty/psr/http-message/LICENSE psr-LICENSE
+mv 3rdparty/php-http/httplug/LICENSE php-http-LICENSE
+mv 3rdparty/php-http/promise/LICENSE php-http-LICENSE
+mv 3rdparty/php-opencloud/openstack/LICENSE php-opencloud-LICENSE
+mv 3rdparty/phpseclib/phpseclib/LICENSE phpseclib-LICENSE
 mv 3rdparty/psr/container/LICENSE psr-LICENSE
+mv 3rdparty/psr/http-client/LICENSE psr-LICENSE
+mv 3rdparty/psr/http-factory/LICENSE psr-LICENSE
+mv 3rdparty/psr/http-message/LICENSE psr-LICENSE
+mv 3rdparty/psr/log/LICENSE psr-LICENSE
+mv 3rdparty/punic/punic/LICENSE.txt punic-LICENSE.txt
+mv 3rdparty/punic/punic/UNICODE-LICENSE.txt punic-UNICODE-LICENSE
+mv 3rdparty/ralouphie/getallheaders/LICENSE ralouphie-LICENSE
+mv 3rdparty/ramsey/uuid/LICENSE ramsey-LICENSE
+mv 3rdparty/react/promise/LICENSE react-LICENSE
+mv 3rdparty/sabre/dav/lib/DAV/Browser/assets/openiconic/ICON-LICENSE sabre-ICON-LICENSE
+mv 3rdparty/sabre/dav/LICENSE sabre-LICENSE
+mv 3rdparty/sabre/event/LICENSE sabre-LICENSE
+mv 3rdparty/sabre/http/LICENSE sabre-LICENSE
+mv 3rdparty/sabre/uri/LICENSE sabre-LICENSE
+mv 3rdparty/sabre/vobject/LICENSE sabre-LICENSE
+mv 3rdparty/sabre/xml/LICENSE sabre-LICENSE
+mv 3rdparty/scssphp/scssphp/LICENSE.md scssphp-LICENSE.md
+mv 3rdparty/spomky-labs/base64url/LICENSE spomky-labs-LICENSE
+mv 3rdparty/spomky-labs/cbor-php/LICENSE spomky-labs-LICENSE
+mv 3rdparty/stecman/symfony-console-completion/LICENCE stecman-LICENSE
+mv 3rdparty/symfony/console/LICENSE symfony-LICENSE
+mv 3rdparty/symfony/event-dispatcher-contracts/LICENSE symfony-LICENSE
+mv 3rdparty/symfony/event-dispatcher/LICENSE symfony-LICENSE
+mv 3rdparty/symfony/polyfill-ctype/LICENSE symfony-LICENSE
+mv 3rdparty/symfony/polyfill-iconv/LICENSE symfony-LICENSE
+mv 3rdparty/symfony/polyfill-intl-idn/LICENSE symfony-LICENSE
+mv 3rdparty/symfony/polyfill-mbstring/LICENSE symfony-LICENSE
+mv 3rdparty/symfony/polyfill-php56/LICENSE symfony-LICENSE
+mv 3rdparty/symfony/polyfill-php72/LICENSE symfony-LICENSE
+mv 3rdparty/symfony/polyfill-php73/LICENSE symfony-LICENSE
+mv 3rdparty/symfony/polyfill-util/LICENSE symfony-LICENSE
+mv 3rdparty/symfony/process/LICENSE symfony-LICENSE
+mv 3rdparty/symfony/routing/LICENSE symfony-LICENSE
+mv 3rdparty/symfony/service-contracts/LICENSE symfony-LICENSE
+mv 3rdparty/symfony/translation-contracts/LICENSE symfony-LICENSE
+mv 3rdparty/symfony/translation/LICENSE symfony-LICENSE
 mv 3rdparty/web-auth/cose-lib/LICENSE web-auth-LICENSE
 mv 3rdparty/web-auth/metadata-service/LICENSE web-auth-LICENSE
 mv 3rdparty/web-auth/webauthn-lib/LICENSE web-auth-LICENSE
-mv 3rdparty/spomky-labs/cbor-php/LICENSE spomky-labs-LICENSE
+mv apps/accessibility/composer/composer/LICENSE accessibility-LICENSE
-mv 3rdparty/spomky-labs/base64url/LICENSE spomky-labs-LICENSE
+mv apps/admin_audit/composer/composer/LICENSE admin_audit-LICENSE
-mv 3rdparty/php-http/promise/LICENSE php-http-LICENSE
+mv apps/cloud_federation_api/composer/composer/LICENSE cloud_federation_api-LICENSE
-mv 3rdparty/php-http/httplug/LICENSE php-http-LICENSE
+mv apps/cloud_federation_api/LICENSE cloud_federation_api-LICENSE
-mv 3rdparty/php-http/guzzle6-adapter/LICENSE php-http-LICENSE
+mv apps/comments/composer/composer/LICENSE comments-LICENSE
-mv 3rdparty/scssphp/scssphp/LICENSE.md scssphp-LICENSE.md
-mv 3rdparty/fgrosse/phpasn1/LICENSE fgrosse-LICENSE
-mv 3rdparty/beberlei/assert/LICENSE beberlei-LICENSE
-mv 3rdparty/symfony/polyfill-ctype/LICENSE symfony-LICENSE
-mv 3rdparty/paragonie/random_compat/LICENSE paragonie-LICENSE
-mv 3rdparty/ramsey/uuid/LICENSE ramsey-LICENSE
-mv 3rdparty/league/uri-components/LICENSE league-LICENSE
-mv 3rdparty/league/uri/LICENSE league-LICENSE
-mv 3rdparty/league/uri-interfaces/LICENSE league-LICENSE
-mv 3rdparty/psr/http-factory/LICENSE psr-LICENSE
-mv 3rdparty/psr/http-client/LICENSE psr-LICENSE
 mv apps/contactsinteraction/composer/composer/LICENSE contactsinteraction-LICENSE
+mv apps/dav/composer/composer/LICENSE dav-LICENSE
 mv apps/encryption/composer/composer/LICENSE encryption-LICENSE
 mv apps/federatedfilesharing/composer/composer/LICENSE federatedfilesharing-LICENSE
-mv apps/theming/js/3rdparty/jscolor/LICENSE.txt jscolor-LICENSE
-mv apps/viewer/COPYING viewer-COPYING
-mv apps/workflowengine/composer/composer/LICENSE workflowengine-LICENSE
-mv apps/dav/composer/composer/LICENSE dav-LICENSE
-mv apps/nextcloud_announcements/COPYING nextcloud_announcements-COPYING
-mv apps/files_trashbin/composer/composer/LICENSE files_trashbin-LICENSE
-mv apps/photos/COPYING photos-COPYING
-mv apps/comments/composer/composer/LICENSE comments-LICENSE
-mv apps/files_external/3rdparty/composer/LICENSE files_external-LICENSE
-mv apps/files_external/3rdparty/icewind/streams/LICENCE icewind_streams-LICENCE
-mv apps/files_external/3rdparty/icewind/smb/LICENSE.txt icewind_smb-LICENSE
-mv apps/oauth2/composer/composer/LICENSE oauth2-LICENSE
-mv apps/systemtags/composer/composer/LICENSE systemtags-LICENSE
-mv apps/accessibility/composer/composer/LICENSE accessibility-LICENSE
-mv apps/updatenotification/composer/composer/LICENSE updatenotification-LICENSE
-mv apps/cloud_federation_api/LICENSE cloud_federation_api-LICENSE
-mv apps/cloud_federation_api/composer/composer/LICENSE cloud_federation_api-LICENSE
-mv apps/provisioning_api/composer/composer/LICENSE provisioning_api-LICENSE
-mv apps/admin_audit/composer/composer/LICENSE admin_audit-LICENSE
-mv apps/files_sharing/composer/composer/LICENSE files_sharing-LICENSE
 mv apps/federation/composer/composer/LICENSE federation-LICENSE
-mv apps/recommendations/LICENSE recommendations-LICENSE
+mv apps/files/composer/composer/LICENSE files-LICENSE
-mv apps/settings/composer/composer/LICENSE settings-LICENSE
+mv apps/files_external/3rdparty/composer/LICENSE files_external-LICENSE
-mv apps/user_ldap/composer/composer/LICENSE user_ldap-LICENSE
+mv apps/files_external/3rdparty/icewind/smb/LICENSE.txt icewind-smb-LICENSE
+mv apps/files_external/3rdparty/icewind/streams/LICENCE icewind-streams-LICENSE
+mv apps/files_pdfviewer/vendor/pdfjs/LICENSE js-pdfjs-LICENSE
+mv apps/files_pdfviewer/vendor/pdfjs/web/cmaps/LICENSE js-pdfjs-cmaps-LICENSE
 mv apps/files_rightclick/COPYING files_rightclick-COPYING
 mv apps/files_rightclick/LICENSE files_rightclick-LICENSE
-mv apps/sharebymail/composer/composer/LICENSE sharebymail-LICENSE
+mv apps/files_sharing/composer/composer/LICENSE files_sharing-LICENSE
-mv apps/privacy/COPYING privacy-COPYING
+mv apps/files_trashbin/composer/composer/LICENSE files_trashbin-LICENSE
 mv apps/files_versions/composer/composer/LICENSE files_versions-LICENSE
-mv apps/files/composer/composer/LICENSE files-LICENSE
-mv apps/twofactor_backupcodes/composer/composer/LICENSE twofactor_backupcodes-LICENSE
 mv apps/lookup_server_connector/composer/composer/LICENSE lookup_server_connector-LICENSE
+mv apps/nextcloud_announcements/COPYING nextcloud_announcements-COPYING
+mv apps/notifications/COPYING notifications-LICENSE
+mv apps/oauth2/composer/composer/LICENSE oauth2-LICENSE
+mv apps/password_policy/LICENSE password_policy-LICENSE
+mv apps/photos/COPYING photos-COPYING
+mv apps/privacy/COPYING privacy-COPYING
+mv apps/provisioning_api/composer/composer/LICENSE provisioning_api-LICENSE
+mv apps/recommendations/LICENSE recommendations-LICENSE
+mv apps/serverinfo/COPYING serverinfo-LICENSE
+mv apps/settings/composer/composer/LICENSE settings-LICENSE
+mv apps/sharebymail/composer/composer/LICENSE sharebymail-LICENSE
+mv apps/survey_client/COPYING survey_client-LICENSE
+mv apps/systemtags/composer/composer/LICENSE systemtags-LICENSE
 mv apps/text/COPYING text-COPYING
-
+mv apps/theming/js/3rdparty/jscolor/LICENSE.txt jscolor-LICENSE
+mv apps/twofactor_backupcodes/composer/composer/LICENSE twofactor_backupcodes-LICENSE
+mv apps/updatenotification/composer/composer/LICENSE updatenotification-LICENSE
+mv apps/user_ldap/composer/composer/LICENSE user_ldap-LICENSE
+mv apps/user_ldap/vendor/ui-multiselect/MIT-LICENSE js-jqueryui-multiselect-LICENSE
+mv apps/viewer/COPYING viewer-COPYING
+mv apps/workflowengine/composer/composer/LICENSE workflowengine-LICENSE
+mv COPYING nextcloud-LICENSE
+mv core/fonts/LICENSE_OFL.txt fonts-LICENSE
+mv core/vendor/zxcvbn/LICENSE.txt zxcvbn-LICENSE
+mv lib/composer/composer/LICENSE composer-LICENSE
 
 
 %check
@@ -355,10 +441,13 @@ for d in $(find . -mindepth 1 -maxdepth 1 -type d | grep -v config); do
     cp -a "$d" %{buildroot}%{_datadir}/%{name}
 done
 
-for f in {*.php,*.html,occ,robots.txt}; do
+for f in {*.php,*.html,robots.txt}; do
     install -pm 644 "$f" %{buildroot}%{_datadir}/%{name}
 done
 
+# occ should be executable
+install -pm 755 occ %{buildroot}%{_datadir}/%{name}
+
 # symlink config dir
 ln -sf %{_sysconfdir}/%{name} %{buildroot}%{_datadir}/%{name}/config
 
@@ -366,14 +455,14 @@ ln -sf %{_sysconfdir}/%{name} %{buildroot}%{_datadir}/%{name}/config
 ln -sf %{_sysconfdir}/pki/tls/certs/ca-bundle.crt %{buildroot}%{_sysconfdir}/%{name}/ca-bundle.crt
 
 # set default config
-install -pm 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/%{name}/config.php
+install -pm 644 %{SOURCE1}    %{buildroot}%{_sysconfdir}/%{name}/config.php
 
 # httpd config
-install -Dpm 644 %{SOURCE1} \
+install -Dpm 644 %{SOURCE100} \
     %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
-install -Dpm 644 %{SOURCE2} \
+install -Dpm 644 %{SOURCE101} \
     %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}-access.conf.avail
-install -Dpm 644 %{SOURCE100} %{SOURCE101} %{SOURCE102} %{SOURCE103} \
+install -Dpm 644 %{SOURCE102} %{SOURCE103} %{SOURCE104} %{SOURCE105} \
     %{buildroot}%{_sysconfdir}/httpd/conf.d/
 
 # nginx config
@@ -382,37 +471,27 @@ install -Dpm 644 %{SOURCE200} \
 install -Dpm 644 %{SOURCE201} \
     %{buildroot}%{_sysconfdir}/nginx/conf.d/%{name}.conf
 
-%if 0%{?el7}
+# php-fpm config
-install -Dpm 644 %{SOURCE203} \
-    %{buildroot}%{_sysconfdir}/php-fpm.d/%{name}.conf
-%else
 install -Dpm 644 %{SOURCE202} \
     %{buildroot}%{_sysconfdir}/php-fpm.d/%{name}.conf
-%endif
 
 # Install the systemd timer
-install -Dpm 644 %{SOURCE10} %{buildroot}%{_unitdir}/nextcloud-cron.service
+install -Dpm 644 %{SOURCE2} %{buildroot}%{_unitdir}/nextcloud-cron.service
-install -Dpm 644 %{SOURCE11} %{buildroot}%{_unitdir}/nextcloud-cron.timer
+install -Dpm 644 %{SOURCE3} %{buildroot}%{_unitdir}/nextcloud-cron.timer
 
 %post httpd
 /usr/bin/systemctl reload httpd.service > /dev/null 2>&1 || :
+/usr/bin/systemctl reload php-fpm.service > /dev/null 2>&1 || :
 
 %postun httpd
 if [ $1 -eq 0 ]; then
   /usr/bin/systemctl reload httpd.service > /dev/null 2>&1 || :
+  /usr/bin/systemctl reload php-fpm.service > /dev/null 2>&1 || :
 fi
 
 %post nginx
-%if 0%{?el7}
+/usr/bin/systemctl reload nginx.service > /dev/null 2>&1 || :
-  # Work around missing php session directory for php-fpm in el7 bz#1338444
+/usr/bin/systemctl reload php-fpm.service > /dev/null 2>&1 || :
-  if [ ! -d /var/lib/php/session ]
-    then
-    mkdir /var/lib/php/session
-  fi
-  /usr/bin/chown apache /var/lib/php/session
-%endif
-  /usr/bin/systemctl reload nginx.service > /dev/null 2>&1 || :
-  /usr/bin/systemctl reload php-fpm.service > /dev/null 2>&1 || :
 
 %postun nginx
 if [ $1 -eq 0 ]; then
@@ -420,48 +499,27 @@ if [ $1 -eq 0 ]; then
   /usr/bin/systemctl reload php-fpm.service > /dev/null 2>&1 || :
 fi
 
-# the selinux policies only cover owncloud right now
-# once this package is accepted pull request for selinux-policy to add
-# these will be made
-%post
-touch '%{_sysconfdir}/%{name}/CAN_INSTALL'
-semanage fcontext -a -t httpd_sys_rw_content_t '%{_sysconfdir}/%{name}/config.php' 2>/dev/null || :
-semanage fcontext -a -t httpd_sys_rw_content_t '%{_sysconfdir}/%{name}' 2>/dev/null || :
-semanage fcontext -a -t httpd_sys_rw_content_t '%{_localstatedir}/lib/%{name}(/.*)?' 2>/dev/null || :
-restorecon -R %{_sysconfdir}/%{name} || :
-restorecon -R %{_localstatedir}/lib/%{name} || :
-
-%postun
-if [ $1 -eq 0  ] ; then
-semanage fcontext -d -t httpd_sys_rw_content_t '%{_sysconfdir}/%{name}/config.php' 2>/dev/null || :
-semanage fcontext -d -t httpd_sys_rw_content_t '%{_sysconfdir}/%{name}' 2>/dev/null || :
-semanage fcontext -d -t httpd_sys_rw_content_t '%{_localstatedir}/lib/%{name}(/.*)?' 2>/dev/null || :
-fi
-
 %files
 %doc AUTHORS README.fedora MIGRATION.fedora config/config.sample.php
-
 %license *-LICENSE
-
 %dir %attr(-,apache,apache) %{_sysconfdir}/%{name}
 # contains sensitive data (dbpassword, passwordsalt)
 %config(noreplace) %attr(0600,apache,apache) %{_sysconfdir}/%{name}/config.php
 # need the symlink in confdir but it's not config
 %{_sysconfdir}/%{name}/ca-bundle.crt
-
 %{_datadir}/%{name}
 %dir %attr(0755,apache,apache) %{_localstatedir}/lib/%{name}
 # user data must not be world readable
 %dir %attr(0750,apache,apache) %{_localstatedir}/lib/%{name}/data
 %attr(-,apache,apache) %{_localstatedir}/lib/%{name}/apps
-
 %{_unitdir}/nextcloud-cron.service
 %{_unitdir}/nextcloud-cron.timer
 
 %files httpd
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{_sysconfdir}/httpd/conf.d/%{name}-access.conf.avail
-%{_sysconfdir}/httpd/conf.d/*.inc
+%{_sysconfdir}/httpd/conf.d/%{name}*.inc
+%config(noreplace) %{_sysconfdir}/php-fpm.d/%{name}.conf
 
 %files nginx
 %config(noreplace) %{_sysconfdir}/nginx/default.d/%{name}.conf
@@ -476,73 +534,4 @@ fi
 
 
 %changelog
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 19.0.0-2
+%autochangelog
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun Jun 28 2020 Ivan Chavero <ichavero@redhat.com> - 19.0.0-1
-- Update to Nextcloud 19.0.0
-- Update licenses
-
-* Thu Apr 30 2020 Ivan Chavero <ichavero@redhat.com> - 18.0.4-1
-- Update to Nextcloud 18.0.4
-
-* Sat Feb 08 2020 Ivan Chavero <ichavero@redhat.com> - 18.0.0-1
-- Refactor spec file
-- Update to Nextcoud 18.0.0
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.4-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.4-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.4-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Jan  9 2019 Remi Collet <remi@remirepo.net> - 10.0.4-6
-- drop dependency on php-password-compat #1658730
-- allow php-smbclient 1.0.0 #1663672
-- allow doctrine/dbal 2.x
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Mar 25 2017 Shawn Iwinski <shawn.iwinski@gmail.com> - 10.0.4-2
-- Add max versions to dependencies to limit each to 1 major version
-- Update some dependencies to use php-composer(*) instead of package names
-- Prepare for php-composer(google/apiclient) version 2 and new version 1 package
-
-* Tue Feb 28 2017 James Hogarth <james.hogarth@gmail.com> - 10.0.4-1
-- update to 10.0.4
-- Add migration from owncloud documentation
-- Add systemd timer for background jobs
-
-* Wed Feb 08 2017 James Hogarth <james.hogarth@gmail.com> - 10.0.3-1
-- update to 10.0.3
-
-* Thu Oct 06 2016 James Hogarth <james.hogarth@gmail.com> - 10.0.1-1
-- update to 10.0.1
-
-* Mon Aug 01 2016 James Hogarth <james.hogarth@gmail.com> - 9.0.53-5
-- Use lua to have a common srpm between epel7 and fedora
-
-* Fri Jul 29 2016 James Hogarth <james.hogarth@gmail.com> - 9.0.53-4
-- Don't unbundle javascript on EPEL7 due to versioning issues
-
-* Fri Jul 29 2016 James Hogarth <james.hogarth@gmail.com> - 9.0.53-3
-- Unbundle javascript libraries from core where possible
-
-* Tue Jul 26 2016 James Hogarth <james.hogarth@gmail.com> - 9.0.53-2
-- Update the autoloader to use the path from the approved package
-
-* Tue Jul 19 2016 James Hogarth <james.hogarth@gmail.com> - 9.0.53-1
-- New release 9.0.53
-
-* Thu Jul 14 2016 James Hogarth <james.hogarth@gmail.com> - 9.0.52-1
-- Initial nextcloud build

plans/base.fmf

@@ -0,0 +1,11 @@
+summary: Basic occ functionality
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/nextcloud
+prepare:
+    how: install
+    package: nextcloud
+environment:
+    PACKAGES: nextcloud
+execute:
+    how: tmt

sources

@@ -1 +1 @@
-SHA512 (nextcloud-19.0.0.tar.bz2) = ac98083887ed59a3cf1003773c46270ba03ad631c4b1ed3608a3de349ecaaf32b9e084307d19bf67956d258fbf7acbe8739f32d34ce07db3c518a9bf5f50aa0d
+SHA512 (nextcloud-19.0.13.tar.bz2) = fd144a0d42617b33388bf1127673adb2e523ef04804021ac90e8e679abcb61d839dcba61270108c8ac62093712e6bffcb83a1caef0c810598a108a57d8bd85d9

utils/get-bundled-versions.py

@@ -0,0 +1,26 @@
+#!/bin/env python
+
+import os
+import json
+
+for root, dirs, files in os.walk("apps"):
+    for file in files:
+        if file == 'composer.lock':
+            with open(os.path.join(root, file)) as f:
+                lockdata = json.load(f)
+                try:
+                    for i in lockdata['packages']:
+                        print("Provides: bundled(php-composer(" + i['name'] + ")) = " + i['version'].strip('v'))
+                except KeyError:
+                    pass
+
+for root, dirs, files in os.walk("3rdparty"):
+    for file in files:
+        if file == 'composer.lock':
+            with open(os.path.join(root, file)) as f:
+                lockdata = json.load(f)
+                try:
+                    for i in lockdata['packages']:
+                        print("Provides: bundled(php-composer(" + i['name'] + ")) = " + i['version'].strip('v'))
+                except KeyError:
+                    pass

utils/get-composer-requires.py

@@ -0,0 +1,82 @@
+#!/bin/env python
+
+import os
+import json
+import re
+import subprocess
+
+defaultconstraint = 2
+excludes = ('php')
+
+constraintmap = ('any', 'loose', 'strict', 'exact')
+
+def get_requires(name, version, constraint):
+    version = version.split('.')
+
+    if constraint == 0:
+        requires = 'php-composer(' + name + ')'
+    elif constraint == 1:
+        wipe = False
+        for i in range(0, len(version)):
+            if version[i] == '0' or wipe:
+                version[i] = '0'
+            else:
+                version[i] = str(int(version[i]) + 1)
+                wipe = True
+            requires = '(php-composer(' + name + ') >= ' + minver + ' with php-composer(' + name + ') < ' + '.'.join(version) + ')'
+    elif constraint == 2:
+        version[-1] = '0'
+        version[-2] = str(int(version[-2]) + 1)
+        requires = '(php-composer(' + name + ') >= ' + minver + ' with php-composer(' + name + ') < ' + '.'.join(version) + ')'
+    else:
+        requires = 'php-composer(' + name + ') = ' + minver
+    return requires
+
+def repoquery(query):
+    stdout = subprocess.run(['dnf', 'repoquery', '-q', '--whatprovides', requires], stdout=subprocess.PIPE, universal_newlines=True, check = True).stdout
+    return stdout
+
+
+with open('3rdparty/composer.json') as f:
+#with open('apps/files_external/3rdparty/composer.json') as f:
+    depdata = json.load(f)
+    for name, version in depdata['require'].items():
+        if name in excludes:
+            print('Skipping ' + name + ': Excluded')
+            continue
+        print(name, version, ':')
+        version = version.replace('v', '')
+        if version == '*':
+            constraint = 0
+            version = '0'
+        elif version.startswith('^'):
+            constraint = 1
+            version = version.strip('^')
+        elif version.startswith('~'):
+            constraint = 2
+            version = version.strip('~')
+        else:
+            constraint = defaultconstraint
+
+        if re.search('[^.0-9]', version):
+            print('Unparseable version:', version)
+            continue
+        else:
+            minver = version
+
+        requires = get_requires(name, version, constraint)
+        print('  Constraint (' + constraintmap[constraint] + '): ' + requires)
+
+        package = repoquery(requires)
+        while len(package) == 0:
+            constraint -= 1
+            if constraint < 0:
+                break
+            requires = get_requires(name, version, constraint)
+            print('  Constraint (' + constraintmap[constraint] + '): ' + requires)
+            package = repoquery(requires)
+
+        if len(package) == 0:
+            print('    -> no providing package found\n')
+        else:
+            print('    -> ' + package)