From 7cc54904c2bae78325f85ea14b3840c39851617b Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Nov 04 2022 10:34:09 +0000 Subject: [PATCH 1/3] update to 24.0.7 --- diff --git a/nextcloud.spec b/nextcloud.spec index a53c074..ea3b60c 100644 --- a/nextcloud.spec +++ b/nextcloud.spec @@ -1,5 +1,5 @@ Name: nextcloud -Version: 24.0.5 +Version: 24.0.7 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 @@ -419,6 +419,8 @@ mv apps/photos/js/photos-main.js.LICENSE.txt photos-main.js-LICENSE mv apps/privacy/COPYING privacy-COPYING mv apps/privacy/js/privacy-main.js.LICENSE.txt privacy-main.js-LICENSE mv apps/recommendations/LICENSE recommendations-LICENSE +mv apps/recommendations/js/dashboard.js.LICENSE.txt recommendations-js-dashboard.js-LICENSE +mv apps/recommendations/js/main.js.LICENSE.txt recommendations-js-main.js-LICENSE mv apps/serverinfo/COPYING serverinfo-LICENSE mv apps/survey_client/COPYING survey_client-LICENSE mv apps/text/COPYING text-COPYING diff --git a/sources b/sources index a4e84b4..b0b6177 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nextcloud-24.0.5.tar.bz2) = 2673853ba97bb868b318b9bb5025bb44dfdb6c82a9d518bb9c5ee642b781ce39f05fd1b31517946e8cace329cd0ab613341005a39b84afe86cd157a8404d4fcd +SHA512 (nextcloud-24.0.7.tar.bz2) = 77c1999b52ab87779908619ec8845887c9da32f90d9eb1e639d07c3899519235a18d973a35a8bfbfe9f896c7b7705cc91d571558700550857f741f98a85a52ef From 9399b1609e3e22b0e99ae11b7f31b585d73656da Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Nov 04 2022 12:09:45 +0000 Subject: [PATCH 2/3] Automate license file renaming Signed-off-by: Harald Hoyer --- diff --git a/nextcloud.spec b/nextcloud.spec index ea3b60c..cdca921 100644 --- a/nextcloud.spec +++ b/nextcloud.spec @@ -312,193 +312,21 @@ cp %{SOURCE303} MIGRATION.fedora 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/package-versions-deprecated/LICENSE composer-LICENSE -mv 3rdparty/deepdiver1975/tarstreamer/LICENSE deepdiver1975-LICENSE -mv 3rdparty/deepdiver/zipstreamer/COPYING deepdiver-COPYING -mv 3rdparty/doctrine/cache/LICENSE doctrine-LICENSE -mv 3rdparty/doctrine/dbal/LICENSE doctrine-LICENSE -mv 3rdparty/doctrine/event-manager/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/uri-template/LICENSE.md guzzlehttp-LICENSE -mv 3rdparty/icewind/searchdav/LICENSE icewind-LICENSE -mv 3rdparty/justinrainbow/json-schema/LICENSE justinrainbow-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/nextcloud/lognormalizer/COPYING lognormalizer-LICENSE -mv 3rdparty/nikic/php-parser/LICENSE nikic-LICENSE -mv 3rdparty/opis/closure/LICENSE opis-LICENSE -mv 3rdparty/pear/console_getopt/LICENSE pear-LICENSE -mv 3rdparty/pear/pear_exception/LICENSE pear-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 -mv 3rdparty/phpseclib/phpseclib/LICENSE phpseclib-LICENSE -mv 3rdparty/psr/event-dispatcher/LICENSE psr-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/collection/LICENSE ramsey-LICENSE -mv 3rdparty/ramsey/uuid/LICENSE ramsey-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-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-php72/LICENSE symfony-LICENSE -mv 3rdparty/symfony/polyfill-php73/LICENSE symfony-LICENSE -mv 3rdparty/symfony/polyfill-php80/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 3rdparty/cweagans/composer-patches/LICENSE.md composer-patches-LICENSE.md -mv 3rdparty/symfony/deprecation-contracts/LICENSE deprecation-contracts-LICENSE -mv apps/activity/js/activity-sidebar.js.LICENSE.txt activity-sidebar.js-LICENSE -mv apps/activity/js/activity-dashboard.js.LICENSE.txt activity-dashboard.js-LICENSE.txt -mv apps/circles/LICENSE circles-LICENSE -mv apps/cloud_federation_api/LICENSE cloud_federation_api-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/files_pdfviewer-workersrc.js.LICENSE.txt files_pdfviewer-workersrc.js-LICENSE -mv apps/files_pdfviewer/js/files_pdfviewer-main.js.LICENSE.txt files_pdfviewer-main.js-LICENSE -mv apps/files_pdfviewer/js/files_pdfviewer-public.js.LICENSE.txt files_pdfviewer-public.js-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/logreader/js/logreader-main.js.LICENSE.txt logreader-main.js-LICENSE -mv apps/nextcloud_announcements/COPYING nextcloud_announcements-COPYING -mv apps/notifications/COPYING notifications-LICENSE -mv apps/notifications/js/notifications-main.js.LICENSE.txt notifications-main.js-LICENSE -mv apps/password_policy/LICENSE password_policy-LICENSE -mv apps/password_policy/js/password_policy-settings.js.LICENSE.txt password_policy-settings.js-LICENSE -mv apps/photos/COPYING photos-COPYING -mv apps/photos/js/photos-main.js.LICENSE.txt photos-main.js-LICENSE -mv apps/privacy/COPYING privacy-COPYING -mv apps/privacy/js/privacy-main.js.LICENSE.txt privacy-main.js-LICENSE -mv apps/recommendations/LICENSE recommendations-LICENSE -mv apps/recommendations/js/dashboard.js.LICENSE.txt recommendations-js-dashboard.js-LICENSE -mv apps/recommendations/js/main.js.LICENSE.txt recommendations-js-main.js-LICENSE -mv apps/serverinfo/COPYING serverinfo-LICENSE -mv apps/survey_client/COPYING survey_client-LICENSE -mv apps/text/COPYING text-COPYING -mv apps/text/js/vendors.js.LICENSE.txt vendors.js-LICENSE.txt -mv apps/text/js/editor-rich.js.LICENSE.txt editor-rich.js-LICENSE.txt -mv apps/text/js/text-files.js.LICENSE.txt text-files.js-LICENSE.txt -mv apps/text/js/text-public.js.LICENSE.txt text-public.js-LICENSE.txt -mv apps/text/js/text-text.js.LICENSE.txt text-text.js-LICENSE.txt -mv apps/text/js/text-viewer.js.LICENSE.txt text-viewer.js-LICENSE.txt -mv apps/text/js/editor.js.LICENSE.txt editor.js-LICENSE.txt -mv apps/theming/js/3rdparty/jscolor/LICENSE.txt jscolor-LICENSE -mv apps/user_ldap/js/vendor/ui-multiselect/MIT-LICENSE js-jqueryui-multiselect-LICENSE -mv apps/viewer/COPYING viewer-COPYING -mv apps/viewer/js/viewer-main.js.LICENSE.txt viewer-main.js-LICENSE -mv COPYING nextcloud-LICENSE -mv core/fonts/LICENSE_OFL.txt fonts-LICENSE -mv core/vendor/zxcvbn/LICENSE.txt zxcvbn-LICENSE -mv apps/files_videoplayer/js/files_videoplayer-main.js.LICENSE.txt files_videoplayer-main.js-LICENSE.txt -mv apps/files_videoplayer/js/files_videoplayer-vendors-node_modules_video_js_dist_video_es_js.js.LICENSE.txt files_videoplayer-vendors-node_modules_video_js_dist_video_es_js.js-LICENSE.txt -mv apps/files_pdfviewer/COPYING files_pdfviewer-COPYING -mv apps/files_pdfviewer/js/pdfjs/web/standard_fonts/LICENSE_FOXIT standard_fonts-LICENSE_FOXIT -mv apps/files_pdfviewer/js/pdfjs/web/standard_fonts/LICENSE_LIBERATION standard_fonts-LICENSE_LIBERATION -mv apps/firstrunwizard/js/firstrunwizard-main.js.LICENSE.txt firstrunwizard-main.js-LICENSE.txt -mv apps/photos/js/photos-src_patchedRequest_js-src_views_Tags_vue.js.LICENSE.txt photos-src_patchedRequest_js-src_views_Tags_vue.js-LICENSE.txt -mv apps/photos/js/photos-vendors-node_modules_nextcloud_moment_dist_index_js-node_modules_nextcloud_moment_node_module-ca085a.js.LICENSE.txt photos-vendors-node_modules_nextcloud_moment_dist_index_js-node_modules_nextcloud_moment_node_module-ca085a.js-LICENSE.txt -mv apps/photos/js/photos-vendors-node_modules_webdav_dist_node_index_js-node_modules_webdav_dist_node_request_js.js.LICENSE.txt photos-vendors-node_modules_webdav_dist_node_index_js-node_modules_webdav_dist_node_request_js.js-LICENSE.txt -mv apps/photos/js/photos-src_views_Albums_vue.js.LICENSE.txt photos-src_views_Albums_vue.js-LICENSE.txt -mv apps/photos/js/photos-node_modules_nextcloud_moment_node_modules_moment_locale_sync_recursive_-src_patchedRequest_j-3cb869.js.LICENSE.txt photos-node_modules_nextcloud_moment_node_modules_moment_locale_sync_recursive_-src_patchedRequest_j-3cb869.js-LICENSE.txt -mv apps/photos/js/photos-vendors-node_modules_nextcloud_moment_dist_index_js-node_modules_moment_locale_af_js-node_mod-100548.js.LICENSE.txt photos-vendors-node_modules_nextcloud_moment_dist_index_js-node_modules_moment_locale_af_js-node_mod-100548.js-LICENSE.txt -mv apps/photos/js/photos-vendors-node_modules_nextcloud_vue_dist_Components_ActionButton_js-node_modules_nextcloud_vue-208129.js.LICENSE.txt photos-vendors-node_modules_nextcloud_vue_dist_Components_ActionButton_js-node_modules_nextcloud_vue-208129.js-LICENSE.txt -mv apps/photos/js/photos-src_mixins_GridConfig_js-src_utils_CancelableRequest_js-src_components_EmptyContent_vue-src_c-45f6cf.js.LICENSE.txt photos-src_mixins_GridConfig_js-src_utils_CancelableRequest_js-src_components_EmptyContent_vue-src_c-45f6cf.js-LICENSE.txt -mv apps/photos/js/photos-src_patchedRequest_js-node_modules_moment_locale_sync_recursive_-src_views_Timeline_vue.js.LICENSE.txt photos-src_patchedRequest_js-node_modules_moment_locale_sync_recursive_-src_views_Timeline_vue.js-LICENSE.txt -mv apps/notifications/js/notifications-settings.js.LICENSE.txt notifications-settings.js-LICENSE.txt -mv dist/settings-vue-settings-personal-security.js.LICENSE.txt settings-vue-settings-personal-security.js.LICENSE.txt -mv dist/core-login.js.LICENSE.txt core-login.js-LICENSE.txt -mv dist/files-sidebar.js.LICENSE.txt files-sidebar.js-LICENSE.txt -mv dist/core-recommendedapps.js.LICENSE.txt core-recommendedapps.js-LICENSE.txt -mv dist/files_sharing-main.js.LICENSE.txt files_sharing-main.js-LICENSE.txt -mv dist/dav-settings-personal-availability.js.LICENSE.txt dav-settings-personal-availability.js-LICENSE.txt -mv dist/weather_status-weather-status.js.LICENSE.txt weather_status-weather-status.js-LICENSE.txt -mv dist/core-profile.js.LICENSE.txt core-profile.js-LICENSE.txt -mv dist/settings-vue-settings-admin-basic-settings.js.LICENSE.txt settings-vue-settings-admin-basic-settings.js-LICENSE.txt -mv dist/settings-vue-settings-admin-security.js.LICENSE.txt settings-vue-settings-admin-security.js-LICENSE.txt -mv dist/core-files_client.js.LICENSE.txt core-files_client.js-LICENSE.txt -mv dist/systemtags-systemtags.js.LICENSE.txt systemtags-systemtags.js-LICENSE.txt -mv dist/comments-comments.js.LICENSE.txt comments-comments.js-LICENSE.txt -mv dist/files_versions-files_versions.js.LICENSE.txt files_versions-files_versions.js.LICENSE.txt -mv dist/accessibility-accessibility.js.LICENSE.txt accessibility-accessibility.js-LICENSE.txt -mv dist/twofactor_backupcodes-settings.js.LICENSE.txt twofactor_backupcodes-settings.js-LICENSE.txt -mv dist/updatenotification-updatenotification.js.LICENSE.txt updatenotification-updatenotification.js-LICENSE.txt -mv dist/settings-vue-settings-admin-delegation.js.LICENSE.txt settings-vue-settings-admin-delegation.js-LICENSE.txt -mv dist/core-systemtags.js.LICENSE.txt core-systemtags.js-LICENSE.txt -mv dist/comments-comments-app.js.LICENSE.txt comments-comments-app.js-LICENSE.txt -mv dist/core-files_fileinfo.js.LICENSE.txt core-files_fileinfo.js-LICENSE.txt -mv dist/files-main.js.LICENSE.txt files-main.js-LICENSE.txt -mv dist/core-main.js.LICENSE.txt core-main.js-LICENSE.txt -mv dist/files_sharing-additionalScripts.js.LICENSE.txt files_sharing-additionalScripts.js-LICENSE.txt -mv dist/settings-vue-settings-apps-users-management.js.LICENSE.txt settings-vue-settings-apps-users-management.js-LICENSE.txt -mv dist/settings-vue-settings-nextcloud-pdf.js.LICENSE.txt settings-vue-settings-nextcloud-pdf.js-LICENSE.txt -mv dist/settings-vue-settings-personal-info.js.LICENSE.txt settings-vue-settings-personal-info.js-LICENSE.txt -mv dist/settings-vue-settings-personal-webauthn.js.LICENSE.txt settings-vue-settings-personal-webauthn.js-LICENSE.txt -mv dist/user_status-dashboard.js.LICENSE.txt user_status-dashboard.js-LICENSE.txt -mv dist/user_status-menu.js.LICENSE.txt user_status-menu.js-LICENSE.txt -mv dist/workflowengine-workflowengine.js.LICENSE.txt workflowengine-workflowengine.js-LICENSE.txt -mv dist/accessibility-accessibilityoca.js.LICENSE.txt accessibility-accessibilityoca.js-LICENSE.txt -mv dist/comments-comments-tab.js.LICENSE.txt comments-comments-tab.js-LICENSE.txt -mv dist/core-install.js.LICENSE.txt core-install.js-LICENSE.txt -mv dist/core-unified-search.js.LICENSE.txt core-unified-search.js-LICENSE.txt -mv dist/dashboard-main.js.LICENSE.txt dashboard-main.js-LICENSE.txt -mv dist/files-personal-settings.js.LICENSE.txt files-personal-settings.js-LICENSE.txt -mv dist/files_sharing-files_sharing_tab.js.LICENSE.txt files_sharing-files_sharing_tab.js-LICENSE.txt -mv dist/files_sharing-personal-settings.js.LICENSE.txt files_sharing-personal-settings.js-LICENSE.txt -mv dist/files_trashbin-files_trashbin.js.LICENSE.txt files_trashbin-files_trashbin.js-LICENSE.txt -mv dist/oauth2-oauth2.js.LICENSE.txt oauth2-oauth2.js-LICENSE.txt -mv dist/settings-users-8351.js.LICENSE.txt settings-users-8351.js-LICENSE.txt -mv dist/core-common.js.LICENSE.txt core-common.js-LICENSE.txt +rename_license_files() { + trap "$(shopt -p nullglob globstar)" RETURN + shopt -q -s nullglob globstar + for file in */**/*LICEN{S,C}E* */**/*COPYING; do + dst=${file%.txt}; + dst=${dst//\//-}; + if ! [[ "$file" -ef "$dst" ]]; then + mv "$file" "$dst" + fi + done +} + +rename_license_files %check # Make sure there are no license files left over From 1f6c5196bea6cc31fc73dff0742384492c76ac20 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Nov 04 2022 12:11:52 +0000 Subject: [PATCH 3/3] update to 25.0.1 Signed-off-by: Harald Hoyer --- diff --git a/nextcloud.spec b/nextcloud.spec index cdca921..ef53dad 100644 --- a/nextcloud.spec +++ b/nextcloud.spec @@ -1,5 +1,5 @@ Name: nextcloud -Version: 24.0.7 +Version: 25.0.1 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 diff --git a/sources b/sources index b0b6177..d325741 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nextcloud-24.0.7.tar.bz2) = 77c1999b52ab87779908619ec8845887c9da32f90d9eb1e639d07c3899519235a18d973a35a8bfbfe9f896c7b7705cc91d571558700550857f741f98a85a52ef +SHA512 (nextcloud-25.0.1.tar.bz2) = 7fd401ffe01e5b1d568e4f66cdc5972d5e3c0b82f147a04330da9fe5ab1f2ddf152943e28f152fb635e8bca8d83a95a5a269a1f34fa189cef4a3c9dbe4e8c89b