From c7217d191dced63c41e3854196290c2d4a617176 Mon Sep 17 00:00:00 2001
From: Christopher Engelhard <ce@lcts.de>
Date: Feb 24 2021 09:39:49 +0000
Subject: Update to 21.0.0


---

diff --git a/nextcloud.spec b/nextcloud.spec
index 1e70a50..15cc93b 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -1,5 +1,5 @@
 Name:           nextcloud
-Version:        20.0.7
+Version:        21.0.0
 Release:        1%{?dist}
 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
@@ -83,100 +83,96 @@ Requires:       php-pecl-redis5
 # the CA cert bundle is linked to from the config dir
 Requires:       %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
 
-
 # Bundled composer libraries
 # many of these can be unbundled
-Provides:       bundled(php-composer(icewind/smb)) = 3.2.7
-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.10.1
-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.10.2
-Provides:       bundled(php-composer(doctrine/event-manager)) = 1.1.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(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(nextcloud/lognormalizer)) = 1.0.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.11
-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.10
-Provides:       bundled(php-composer(symfony/event-dispatcher)) = 4.4.10
-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-php80)) = 1.17.1
-Provides:       bundled(php-composer(symfony/polyfill-util)) = 1.10.0
-Provides:       bundled(php-composer(symfony/process)) = 4.4.10
-Provides:       bundled(php-composer(symfony/routing)) = 4.4.10
-Provides:       bundled(php-composer(symfony/service-contracts)) = 1.1.8
-Provides:       bundled(php-composer(symfony/translation)) = 4.4.10
-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(icewind/smb)) = 3.2.7
+Provides: bundled(php-composer(icewind/streams)) = 0.7.1
+Provides: bundled(php-composer(aws/aws-sdk-php)) = 3.171.21
+Provides: bundled(php-composer(bantu/ini-get-wrapper)) = 1.0.1
+Provides: bundled(php-composer(beberlei/assert)) = 3.3.0
+Provides: bundled(php-composer(brick/math)) = 0.9.1
+Provides: bundled(php-composer(christophwurst/id3parser)) = 0.1.1
+Provides: bundled(php-composer(composer/package-versions-deprecated)) = 1.11.99.1
+Provides: bundled(php-composer(deepdiver/zipstreamer)) = 2.0.0
+Provides: bundled(php-composer(deepdiver1975/tarstreamer)) = 2.0.0
+Provides: bundled(php-composer(doctrine/cache)) = 1.10.2
+Provides: bundled(php-composer(doctrine/dbal)) = 3.0.0
+Provides: bundled(php-composer(doctrine/event-manager)) = 1.1.1
+Provides: bundled(php-composer(doctrine/lexer)) = 1.2.1
+Provides: bundled(php-composer(egulias/email-validator)) = 2.1.25
+Provides: bundled(php-composer(fgrosse/phpasn1)) = 2.2.0
+Provides: bundled(php-composer(giggsey/libphonenumber-for-php)) = 8.12.16
+Provides: bundled(php-composer(giggsey/locale)) = 1.9
+Provides: bundled(php-composer(guzzlehttp/guzzle)) = 7.2.0
+Provides: bundled(php-composer(guzzlehttp/promises)) = 1.4.0
+Provides: bundled(php-composer(guzzlehttp/psr7)) = 1.7.0
+Provides: bundled(php-composer(guzzlehttp/uri-template)) = 0.2.0
+Provides: bundled(php-composer(icewind/searchdav)) = 2.0.0
+Provides: bundled(php-composer(icewind/streams)) = 0.7.2
+Provides: bundled(php-composer(justinrainbow/json-schema)) = 5.2.10
+Provides: bundled(php-composer(league/flysystem)) = 1.1.3
+Provides: bundled(php-composer(league/mime-type-detection)) = 1.7.0
+Provides: bundled(php-composer(league/uri)) = 6.4.0
+Provides: bundled(php-composer(league/uri-interfaces)) = 2.2.0
+Provides: bundled(php-composer(microsoft/azure-storage-blob)) = 1.5.2
+Provides: bundled(php-composer(microsoft/azure-storage-common)) = 1.5.1
+Provides: bundled(php-composer(mtdowling/jmespath.php)) = 2.6.0
+Provides: bundled(php-composer(nextcloud/lognormalizer)) = 1.0.0
+Provides: bundled(php-composer(nikic/php-parser)) = 4.10.4
+Provides: bundled(php-composer(opis/closure)) = 3.6.1
+Provides: bundled(php-composer(patchwork/jsqueeze)) = 2.0.5
+Provides: bundled(php-composer(pear/archive_tar)) = 1.4.12
+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-ds/php-ds)) = 1.3.0
+Provides: bundled(php-composer(php-http/guzzle7-adapter)) = 0.1.1
+Provides: bundled(php-composer(php-http/httplug)) = 2.2.0
+Provides: bundled(php-composer(php-http/promise)) = 1.1.0
+Provides: bundled(php-composer(php-opencloud/openstack)) = 3.1.0
+Provides: bundled(php-composer(phpseclib/phpseclib)) = 2.0.30
+Provides: bundled(php-composer(pimple/pimple)) = 3.3.1
+Provides: bundled(php-composer(psr/container)) = 1.0.0
+Provides: bundled(php-composer(psr/http-client)) = 1.0.1
+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.3
+Provides: bundled(php-composer(punic/punic)) = 1.6.5
+Provides: bundled(php-composer(ralouphie/getallheaders)) = 3.0.3
+Provides: bundled(php-composer(ramsey/collection)) = 1.1.1
+Provides: bundled(php-composer(ramsey/uuid)) = 4.1.1
+Provides: bundled(php-composer(sabre/dav)) = 4.1.4
+Provides: bundled(php-composer(sabre/event)) = 5.1.2
+Provides: bundled(php-composer(sabre/http)) = 5.1.1
+Provides: bundled(php-composer(sabre/uri)) = 2.2.1
+Provides: bundled(php-composer(sabre/vobject)) = 4.3.3
+Provides: bundled(php-composer(sabre/xml)) = 2.2.3
+Provides: bundled(php-composer(scssphp/scssphp)) = 1.4.1
+Provides: bundled(php-composer(spomky-labs/base64url)) = 2.0.4
+Provides: bundled(php-composer(spomky-labs/cbor-php)) = 2.0.1
+Provides: bundled(php-composer(stecman/symfony-console-completion)) = 0.11.0
+Provides: bundled(php-composer(swiftmailer/swiftmailer)) = 6.2.5
+Provides: bundled(php-composer(symfony/console)) = 4.4.19
+Provides: bundled(php-composer(symfony/event-dispatcher)) = 4.4.19
+Provides: bundled(php-composer(symfony/event-dispatcher-contracts)) = 1.1.9
+Provides: bundled(php-composer(symfony/polyfill-ctype)) = 1.22.0
+Provides: bundled(php-composer(symfony/polyfill-iconv)) = 1.22.0
+Provides: bundled(php-composer(symfony/polyfill-intl-grapheme)) = 1.22.0
+Provides: bundled(php-composer(symfony/polyfill-intl-idn)) = 1.22.0
+Provides: bundled(php-composer(symfony/polyfill-intl-normalizer)) = 1.22.0
+Provides: bundled(php-composer(symfony/polyfill-mbstring)) = 1.22.0
+Provides: bundled(php-composer(symfony/polyfill-php72)) = 1.22.0
+Provides: bundled(php-composer(symfony/polyfill-php73)) = 1.22.0
+Provides: bundled(php-composer(symfony/polyfill-php80)) = 1.22.0
+Provides: bundled(php-composer(symfony/process)) = 4.4.19
+Provides: bundled(php-composer(symfony/routing)) = 4.4.19
+Provides: bundled(php-composer(symfony/service-contracts)) = 2.2.0
+Provides: bundled(php-composer(symfony/translation)) = 4.4.19
+Provides: bundled(php-composer(symfony/translation-contracts)) = 2.3.0
+Provides: bundled(php-composer(thecodingmachine/safe)) = 1.3.3
+Provides: bundled(php-composer(web-auth/cose-lib)) = 3.3.1
+Provides: bundled(php-composer(web-auth/metadata-service)) = 3.3.1
+Provides: bundled(php-composer(web-auth/webauthn-lib)) = 3.3.1
 
 # OpenIconic icons bundled via sabre-dav
 Provides:       bundled(openiconic-fonts) = 1.0.0
@@ -278,35 +274,33 @@ cp %{SOURCE302} README.postgresql
 cp %{SOURCE303} MIGRATION.fedora
 
 # Locate license files and put them sensibly in place
-# find all using "find -name '*LICENSE*' -o -name '*COPYING*' | sort"
+# get rid of all composer licenses
+find -wholename "*/composer/LICENSE" -exec mv {} composer-LICENSE \;
+
+# find all remaining using "find -name '*LICENCE*' -name '*LICENSE*' -o -name '*COPYING*' | sort"
 mv 3rdparty/aws/aws-sdk-php/LICENSE.md aws-LICENSE.md
 mv 3rdparty/bantu/ini-get-wrapper/LICENSE bantu-LICENSE
 mv 3rdparty/beberlei/assert/LICENSE beberlei-LICENSE
+mv 3rdparty/brick/math/LICENSE brick-LICENSE
 mv 3rdparty/christophwurst/id3parser/LICENSE christophwurst-LICENSE
-mv 3rdparty/composer/LICENSE composer-LICENSE
+mv 3rdparty/composer/package-versions-deprecated/LICENSE composer-LICENSE
 mv 3rdparty/deepdiver1975/tarstreamer/LICENSE deepdiver1975-LICENSE
 mv 3rdparty/deepdiver/zipstreamer/COPYING deepdiver-COPYING
-mv 3rdparty/doctrine/annotations/LICENSE doctrine-LICENSE
 mv 3rdparty/doctrine/cache/LICENSE doctrine-LICENSE
-mv 3rdparty/doctrine/collections/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/egulias/email-validator/LICENSE egulias-LICENSE
 mv 3rdparty/fgrosse/phpasn1/LICENSE fgrosse-LICENSE
+mv 3rdparty/giggsey/libphonenumber-for-php/LICENSE giggsey-LICENSE
+mv 3rdparty/giggsey/locale/LICENSE giggsey-LICENSE
 mv 3rdparty/guzzlehttp/guzzle/LICENSE guzzlehttp-LICENSE
 mv 3rdparty/guzzlehttp/promises/LICENSE guzzlehttp-LICENSE
 mv 3rdparty/guzzlehttp/psr7/LICENSE guzzlehttp-LICENSE
-mv 3rdparty/guzzlehttp/ringphp/LICENSE guzzlehttp-LICENSE
-mv 3rdparty/guzzlehttp/streams/LICENSE guzzlehttp-LICENSE
+mv 3rdparty/guzzlehttp/uri-template/LICENSE.md guzzlehttp-LICENSE
 mv 3rdparty/icewind/searchdav/LICENSE icewind-LICENSE
-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/mime-type-detection/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
@@ -315,14 +309,13 @@ mv 3rdparty/microsoft/azure-storage-common/LICENSE microsoft-LICENSE
 mv 3rdparty/mtdowling/jmespath.php/LICENSE mtdowling-LICENSE
 mv 3rdparty/nextcloud/lognormalizer/COPYING lognormalizer-LICENSE
 mv 3rdparty/nikic/php-parser/LICENSE nikic-LICENSE
-mv 3rdparty/paragonie/random_compat/LICENSE paragonie-LICENSE
+mv 3rdparty/opis/closure/LICENSE opis-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/pear/pear_exception/LICENSE pear-LICENSE
-mv 3rdparty/php-http/guzzle6-adapter/LICENSE php-http-LICENSE
+mv 3rdparty/php-ds/php-ds/LICENSE php-ds-LICENSE
+mv 3rdparty/php-http/guzzle7-adapter/LICENSE php-http-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
@@ -335,8 +328,8 @@ 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/collection/LICENSE ramsey-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
@@ -353,77 +346,53 @@ 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-grapheme/LICENSE symfony-LICENSE
 mv 3rdparty/symfony/polyfill-intl-idn/LICENSE symfony-LICENSE
+mv 3rdparty/symfony/polyfill-intl-normalizer/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-php80/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/thecodingmachine/safe/LICENSE thecodingmachine-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 apps/accessibility/composer/composer/LICENSE accessibility-LICENSE
-mv apps/admin_audit/composer/composer/LICENSE admin_audit-LICENSE
-mv apps/cloud_federation_api/composer/composer/LICENSE cloud_federation_api-LICENSE
 mv apps/cloud_federation_api/LICENSE cloud_federation_api-LICENSE
-mv apps/comments/composer/composer/LICENSE comments-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/federation/composer/composer/LICENSE federation-LICENSE
-mv apps/files/composer/composer/LICENSE files-LICENSE
-mv apps/files_external/3rdparty/composer/LICENSE files_external-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_external/3rdparty/icewind/smb/LICENSE.txt icewind-LICENSE
+mv apps/files_external/3rdparty/icewind/streams/LICENCE icewind-LICENSE
 mv apps/files_pdfviewer/js/pdfjs/LICENSE js-pdfjs-LICENSE
 mv apps/files_pdfviewer/js/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/files_sharing/composer/composer/LICENSE files_sharing-LICENSE
-mv apps/files_trashbin/composer/composer/LICENSE files_trashbin-LICENSE
-mv apps/files_versions/composer/composer/LICENSE files_versions-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/user_status/composer/composer/LICENSE user_status-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
 # Make sure there are no license files left over
+: Check for leftover license files
+find . -mindepth 2 \( -name '*LICENSE*' -o -name '*LICENCE*' -o  -name '*COPYING*' \)
 nb=$( find . -mindepth 2 \( -name '*LICENSE*' -o -name '*LICENCE*' -o  -name '*COPYING*' \) | wc -l )
 if [ $nb -gt 0 ]
   then
-  false found unexpected licenses to verify
+  false Found unexpected licenses to verify
 fi
 
 
@@ -533,6 +502,9 @@ fi
 
 
 %changelog
+* Wed Feb 24 2021 Christopher Engelhard <ce@lcts.de> - 21.0.0-1
+- Update to 21.0.0
+
 * Sat Feb 20 2021 Christopher Engelhard <ce@lcts.de> - 20.0.7-1
 - Update to 20.0.7
 
diff --git a/sources b/sources
index b42510e..f041590 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 SHA512 (nextcloud-20.0.5.tar.bz2) = 8839795e0c31c0bb264888f55c189214b802bc50e096af90530b4ef395e54a29bd3b9a7de5bfabc314ded61fd8ddf79c7d445b4277a46bb342f4273c64bd0219
 SHA512 (nextcloud-20.0.7.tar.bz2) = 24cda9579d24422ea1c72c256ad208e936372077f62a91b3ca4e99ac511127dee5cc128c163174373394883114107cdda52bcb012faa282767710e1365ced3b3
+SHA512 (nextcloud-21.0.0.tar.bz2) = a1ae3400f0fb5997e54b0cee821c50d13e4ba0e27c9d11731c8b5233cba564666121a58aed848ccd2593a9783e27db1ed98ff559588a76a1acaeaf083ef4404a