From 6e2d37e5abaffd949b996f565b246ef604dd6281 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sun, 10 Nov 2024 18:53:44 -0600
Subject: [PATCH 01/32] 32.0.2 release RHBZ#2319576

---
 nextcloud.spec | 133 ++++++++++++++++++++++++-------------------------
 sources        |   2 +-
 2 files changed, 66 insertions(+), 69 deletions(-)

diff --git a/nextcloud.spec b/nextcloud.spec
index 0d4fecd..63d60f7 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        29.0.9
+Version:        30.0.2
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
@@ -40,17 +40,16 @@ 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
 # Add the ability to exclude files we specify from the nextcloud integrity checker
-Patch2:         nextcloud-integritycheck-exclusion.patch
+Patch1:         nextcloud-integritycheck-exclusion.patch
 
 BuildArch:      noarch
 
 # Set this to the minimum supported php version Nextcloud will run on
 # Exists to prevent accidental building on distros with outdated php's
-BuildRequires:  php(language) >= 8.0
+BuildRequires:  php(language) >= 8.1
 BuildRequires:  systemd-rpm-macros
+BuildRequires:  sed
 
 # expand pear macros on install
 BuildRequires:  php-pear
@@ -104,21 +103,22 @@ Requires:       %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
 # I think utils/get-composer-requires.py is a tool to check if these are available on Fedora
 Provides: bundled(php-composer(christian-riesen/base32)) = 1.6.0
 Provides: bundled(php-composer(rullzer/easytotp)) = 0.1.4
-Provides: bundled(php-composer(adhocore/cli)) = 1.6.2
-Provides: bundled(php-composer(nextcloud/openapi-extractor)) = dev-main
-Provides: bundled(php-composer(nikic/php-parser)) = 4.18.0
-Provides: bundled(php-composer(phpstan/phpdoc-parser)) = 1.25.0
+Provides: bundled(php-composer(adhocore/cli)) = 1.7.1
+Provides: bundled(php-composer(nextcloud/openapi-extractor)) = 1.0.0
+Provides: bundled(php-composer(nikic/php-parser)) = 5.1.0
+Provides: bundled(php-composer(phpstan/phpdoc-parser)) = 1.29.1
 Provides: bundled(php-composer(icewind/smb)) = 3.5.4
 Provides: bundled(php-composer(icewind/streams)) = 0.7.7
 Provides: bundled(php-composer(bamarni/composer-bin-plugin)) = 1.8.2
 Provides: bundled(php-composer(hexogen/kdtree)) = 0.2.5
-Provides: bundled(php-composer(amphp/amp)) = 2.6.2
+Provides: bundled(php-composer(amphp/amp)) = 2.6.4
 Provides: bundled(php-composer(amphp/byte-stream)) = 1.8.1
 Provides: bundled(php-composer(amphp/parallel)) = 1.4.3
 Provides: bundled(php-composer(amphp/parser)) = 1.1.0
 Provides: bundled(php-composer(amphp/process)) = 1.1.4
 Provides: bundled(php-composer(amphp/serialization)) = 1.0.0
 Provides: bundled(php-composer(amphp/sync)) = 1.4.2
+Provides: bundled(php-composer(bamarni/composer-bin-plugin)) = 1.8.2
 Provides: bundled(php-composer(league/flysystem)) = 2.5.0
 Provides: bundled(php-composer(league/mime-type-detection)) = 1.11.0
 Provides: bundled(php-composer(psr/log)) = 1.1.4
@@ -127,49 +127,47 @@ Provides: bundled(php-composer(rubix/tensor)) = 2.2.3
 Provides: bundled(php-composer(symfony/polyfill-mbstring)) = 1.27.0
 Provides: bundled(php-composer(symfony/polyfill-php73)) = 1.26.0
 Provides: bundled(php-composer(symfony/polyfill-php80)) = 1.27.0
-Provides: bundled(php-composer(aws/aws-crt-php)) = 1.2.6
-Provides: bundled(php-composer(aws/aws-sdk-php)) = 3.322.4
+Provides: bundled(php-composer(aws/aws-crt-php)) = 1.2.5
+Provides: bundled(php-composer(aws/aws-sdk-php)) = 3.311.2
 Provides: bundled(php-composer(bantu/ini-get-wrapper)) = 1.0.1
-Provides: bundled(php-composer(beberlei/assert)) = 3.3.1
-Provides: bundled(php-composer(brick/math)) = 0.9.2
+Provides: bundled(php-composer(brick/math)) = 0.12.1
 Provides: bundled(php-composer(cweagans/composer-patches)) = 1.7.3
 Provides: bundled(php-composer(deepdiver/zipstreamer)) = 2.0.3
 Provides: bundled(php-composer(deepdiver1975/tarstreamer)) = 2.1.0
 Provides: bundled(php-composer(doctrine/cache)) = 2.2.0
-Provides: bundled(php-composer(doctrine/dbal)) = 3.8.3
-Provides: bundled(php-composer(doctrine/deprecations)) = 1.1.2
-Provides: bundled(php-composer(doctrine/event-manager)) = 1.2.0
-Provides: bundled(php-composer(doctrine/lexer)) = 2.1.0
-Provides: bundled(php-composer(egulias/email-validator)) = 3.2.6
-Provides: bundled(php-composer(fgrosse/phpasn1)) = 2.3.0
-Provides: bundled(php-composer(fusonic/linq)) = 1.1.0
-Provides: bundled(php-composer(fusonic/opengraph)) = 2.2.0
-Provides: bundled(php-composer(giggsey/libphonenumber-for-php-lite)) = 8.13.27
-Provides: bundled(php-composer(guzzlehttp/guzzle)) = 7.8.1
-Provides: bundled(php-composer(guzzlehttp/promises)) = 1.5.3
-Provides: bundled(php-composer(guzzlehttp/psr7)) = 2.6.2
-Provides: bundled(php-composer(guzzlehttp/uri-template)) = 0.2.0
+Provides: bundled(php-composer(doctrine/dbal)) = 3.9.1
+Provides: bundled(php-composer(doctrine/deprecations)) = 1.1.3
+Provides: bundled(php-composer(doctrine/event-manager)) = 2.0.1
+Provides: bundled(php-composer(doctrine/lexer)) = 3.0.1
+Provides: bundled(php-composer(egulias/email-validator)) = 4.0.2
+Provides: bundled(php-composer(fusonic/opengraph)) = 2.3.0
+Provides: bundled(php-composer(giggsey/libphonenumber-for-php-lite)) = 8.13.45
+Provides: bundled(php-composer(guzzlehttp/guzzle)) = 7.8.2
+Provides: bundled(php-composer(guzzlehttp/promises)) = 2.0.4
+Provides: bundled(php-composer(guzzlehttp/psr7)) = 2.7.0
+Provides: bundled(php-composer(guzzlehttp/uri-template)) = 1.0.3
 Provides: bundled(php-composer(icewind/searchdav)) = 3.1.0
 Provides: bundled(php-composer(icewind/streams)) = 0.7.7
 Provides: bundled(php-composer(justinrainbow/json-schema)) = 5.2.13
 Provides: bundled(php-composer(kornrunner/blurhash)) = 1.2.2
-Provides: bundled(php-composer(laravel/serializable-closure)) = 1.3.3
-Provides: bundled(php-composer(league/uri)) = 6.4.0
-Provides: bundled(php-composer(league/uri-interfaces)) = 2.2.0
+Provides: bundled(php-composer(laravel/serializable-closure)) = 1.3.5
+Provides: bundled(php-composer(lcobucci/clock)) = 3.0.0
+Provides: bundled(php-composer(masterminds/html5)) = 2.9.0
 Provides: bundled(php-composer(mexitek/phpcolors)) = 1.0.4
 Provides: bundled(php-composer(microsoft/azure-storage-blob)) = 1.5.4
 Provides: bundled(php-composer(microsoft/azure-storage-common)) = 1.5.2
 Provides: bundled(php-composer(mlocati/ip-lib)) = 1.18.0
-Provides: bundled(php-composer(mtdowling/jmespath.php)) = 2.6.1
+Provides: bundled(php-composer(mtdowling/jmespath.php)) = 2.7.0
 Provides: bundled(php-composer(nextcloud/lognormalizer)) = 1.0.0
-Provides: bundled(php-composer(pear/archive_tar)) = 1.4.14
+Provides: bundled(php-composer(paragonie/constant_time_encoding)) = 2.7.0
+Provides: bundled(php-composer(pear/archive_tar)) = 1.5.0
 Provides: bundled(php-composer(pear/console_getopt)) = 1.4.3
-Provides: bundled(php-composer(pear/pear-core-minimal)) = 1.10.14
+Provides: bundled(php-composer(pear/pear-core-minimal)) = 1.10.15
 Provides: bundled(php-composer(pear/pear_exception)) = 1.0.2
 Provides: bundled(php-composer(php-http/guzzle7-adapter)) = 1.0.0
 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.2.1
+Provides: bundled(php-composer(php-opencloud/openstack)) = 3.10.0
 Provides: bundled(php-composer(phpseclib/phpseclib)) = 2.0.47
 Provides: bundled(php-composer(pimple/pimple)) = 3.5.0
 Provides: bundled(php-composer(psr/cache)) = 3.0.0
@@ -177,51 +175,48 @@ Provides: bundled(php-composer(psr/clock)) = 1.0.0
 Provides: bundled(php-composer(psr/container)) = 2.0.2
 Provides: bundled(php-composer(psr/event-dispatcher)) = 1.0.0
 Provides: bundled(php-composer(psr/http-client)) = 1.0.3
-Provides: bundled(php-composer(psr/http-factory)) = 1.0.2
+Provides: bundled(php-composer(psr/http-factory)) = 1.1.0
 Provides: bundled(php-composer(psr/http-message)) = 1.1
-Provides: bundled(php-composer(psr/log)) = 1.1.4
+Provides: bundled(php-composer(psr/log)) = 2.0.0
 Provides: bundled(php-composer(punic/punic)) = 3.8.1
 Provides: bundled(php-composer(ralouphie/getallheaders)) = 3.0.3
-Provides: bundled(php-composer(ramsey/collection)) = 1.1.3
-Provides: bundled(php-composer(ramsey/uuid)) = 4.1.1
-Provides: bundled(php-composer(sabre/dav)) = 4.5.0
+Provides: bundled(php-composer(sabre/dav)) = 4.6.0
 Provides: bundled(php-composer(sabre/event)) = 5.1.4
 Provides: bundled(php-composer(sabre/http)) = 5.1.10
 Provides: bundled(php-composer(sabre/uri)) = 2.3.3
 Provides: bundled(php-composer(sabre/vobject)) = 4.5.4
-Provides: bundled(php-composer(sabre/xml)) = 2.2.6
+Provides: bundled(php-composer(sabre/xml)) = 2.2.7
 Provides: bundled(php-composer(scssphp/scssphp)) = 1.12.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(symfony/console)) = 5.4.35
-Provides: bundled(php-composer(symfony/css-selector)) = 5.4.11
-Provides: bundled(php-composer(symfony/deprecation-contracts)) = 3.0.2
-Provides: bundled(php-composer(symfony/dom-crawler)) = 5.4.11
-Provides: bundled(php-composer(symfony/event-dispatcher)) = 5.4.26
+Provides: bundled(php-composer(spomky-labs/cbor-php)) = 3.1.0
+Provides: bundled(php-composer(spomky-labs/pki-framework)) = 1.2.1
+Provides: bundled(php-composer(stecman/symfony-console-completion)) = 0.13.0
+Provides: bundled(php-composer(symfony/console)) = 6.4.12
+Provides: bundled(php-composer(symfony/css-selector)) = 6.4.3
+Provides: bundled(php-composer(symfony/deprecation-contracts)) = 3.5.0
+Provides: bundled(php-composer(symfony/dom-crawler)) = 6.4.4
+Provides: bundled(php-composer(symfony/event-dispatcher)) = 6.4.8
 Provides: bundled(php-composer(symfony/event-dispatcher-contracts)) = 3.0.2
-Provides: bundled(php-composer(symfony/http-foundation)) = 5.4.25
-Provides: bundled(php-composer(symfony/mailer)) = 5.4.22
-Provides: bundled(php-composer(symfony/mime)) = 5.4.19
-Provides: bundled(php-composer(symfony/polyfill-ctype)) = 1.28.0
-Provides: bundled(php-composer(symfony/polyfill-intl-grapheme)) = 1.28.0
-Provides: bundled(php-composer(symfony/polyfill-intl-idn)) = 1.28.0
-Provides: bundled(php-composer(symfony/polyfill-intl-normalizer)) = 1.28.0
-Provides: bundled(php-composer(symfony/polyfill-mbstring)) = 1.28.0
-Provides: bundled(php-composer(symfony/polyfill-php72)) = 1.28.0
-Provides: bundled(php-composer(symfony/polyfill-php73)) = 1.28.0
-Provides: bundled(php-composer(symfony/polyfill-php80)) = 1.28.0
-Provides: bundled(php-composer(symfony/process)) = 5.4.34
-Provides: bundled(php-composer(symfony/routing)) = 5.4.25
+Provides: bundled(php-composer(symfony/http-foundation)) = 6.4.12
+Provides: bundled(php-composer(symfony/mailer)) = 6.4.12
+Provides: bundled(php-composer(symfony/mime)) = 6.4.12
+Provides: bundled(php-composer(symfony/polyfill-ctype)) = 1.29.0
+Provides: bundled(php-composer(symfony/polyfill-intl-grapheme)) = 1.31.0
+Provides: bundled(php-composer(symfony/polyfill-intl-idn)) = 1.31.0
+Provides: bundled(php-composer(symfony/polyfill-intl-normalizer)) = 1.31.0
+Provides: bundled(php-composer(symfony/polyfill-mbstring)) = 1.31.0
+Provides: bundled(php-composer(symfony/polyfill-php80)) = 1.29.0
+Provides: bundled(php-composer(symfony/polyfill-php83)) = 1.31.0
+Provides: bundled(php-composer(symfony/polyfill-uuid)) = 1.31.0
+Provides: bundled(php-composer(symfony/process)) = 6.4.12
+Provides: bundled(php-composer(symfony/routing)) = 6.4.12
 Provides: bundled(php-composer(symfony/service-contracts)) = 3.0.2
 Provides: bundled(php-composer(symfony/string)) = 6.0.19
-Provides: bundled(php-composer(symfony/translation)) = 5.4.24
-Provides: bundled(php-composer(symfony/translation-contracts)) = 2.4.0
-Provides: bundled(php-composer(thecodingmachine/safe)) = 1.3.3
+Provides: bundled(php-composer(symfony/translation)) = 6.4.12
+Provides: bundled(php-composer(symfony/translation-contracts)) = 3.4.2
+Provides: bundled(php-composer(symfony/uid)) = 6.4.12
 Provides: bundled(php-composer(wapmorgan/mp3info)) = 0.1.0
-Provides: bundled(php-composer(web-auth/cose-lib)) = 3.3.9
-Provides: bundled(php-composer(web-auth/metadata-service)) = 3.3.9
-Provides: bundled(php-composer(web-auth/webauthn-lib)) = 3.3.9
+Provides: bundled(php-composer(web-auth/cose-lib)) = 4.4.0
+Provides: bundled(php-composer(web-auth/webauthn-lib)) = 4.9.1
 # OpenIconic icons bundled via sabre-dav
 Provides:       bundled(openiconic-fonts) = 1.0.0
 # jscolor bundled via themeing app
@@ -306,10 +301,12 @@ Requires:       %{name} = %{version}-%{release}
 This package ensures the necessary dependencies are in place for NextCloud to
 work with an SQLite 3 database stored on the local system.
 
-
 %prep
 %autosetup -n %{name} -p1
 
+# Fix php shebang in occ
+sed -ri 's\^#!/usr/bin/env php$\#!%{_bindir}/php\' occ
+
 # patch backup files and .git stuff
 find . -name \*.orig    -type f -delete -print
 find . -name .gitignore -type f -delete -print
diff --git a/sources b/sources
index 5a60ce5..f5f9412 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nextcloud-29.0.9.tar.bz2) = e0acd458ee87f9269f6e80c0b3b8b68226a80dc49aae9fc084cefdf156060edc983ac8f88b1ce15a3eead9eff8b60dc2ec69920a5499a923cad8496e8fa8bd7a
+SHA512 (nextcloud-30.0.2.tar.bz2) = 5587fd8a5695b70165bc705cc79294779a7d64e755d8a37e76a13b0f28da3132ea4228615f1fd2ed13727b34d4c03c7fd1965587590aa0dd8847b7a0b00b5fe7

From 9af3572351873a5da692d2b5ee0eb534d92cdb54 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Mon, 30 Dec 2024 09:39:20 -0600
Subject: [PATCH 02/32] 30.0.4 release RHBZ#2330565

---
 bodhi.template.last | 44 ++++++++++++++++++++++++++++++++++++++++++++
 nextcloud.spec      |  3 ++-
 sources             |  2 +-
 3 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 bodhi.template.last

diff --git a/bodhi.template.last b/bodhi.template.last
new file mode 100644
index 0000000..8e233c3
--- /dev/null
+++ b/bodhi.template.last
@@ -0,0 +1,44 @@
+[ nextcloud-30.0.2-1.fc41 ]
+
+# bugfix, security, enhancement, newpackage (required)
+type=enhancement
+
+# testing, stable
+request=testing
+
+# Bug numbers: 1234,9876
+bugs=
+
+# Severity: low, medium, high, urgent
+# This is required for security updates.
+severity=unspecified
+
+display_name=
+
+
+# Here is where you give an explanation of your update.
+# Content can span multiple lines, as long as they are indented deeper than
+# the first line. For example,
+# notes=first line
+#     second line
+#     and so on
+notes=32.0.2 release RHBZ#2319576
+
+# Enable request automation based on the stable/unstable karma thresholds
+autokarma=True
+stable_karma=3
+unstable_karma=-3
+
+# Automatically close bugs when this marked as stable
+close_bugs=True
+
+# Suggest that users performs one of the following actions after the update:
+# unspecified, restart, logout
+# The default value is unspecified
+suggest=unspecified
+
+# A boolean to require that all of the bugs in your update have been confirmed by testers.
+require_bugs=True
+
+# A boolean to require that this update passes all test cases before reaching stable.
+require_testcases=True
diff --git a/nextcloud.spec b/nextcloud.spec
index 63d60f7..a78225e 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        30.0.2
+Version:        30.0.4
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
@@ -217,6 +217,7 @@ Provides: bundled(php-composer(symfony/uid)) = 6.4.12
 Provides: bundled(php-composer(wapmorgan/mp3info)) = 0.1.0
 Provides: bundled(php-composer(web-auth/cose-lib)) = 4.4.0
 Provides: bundled(php-composer(web-auth/webauthn-lib)) = 4.9.1
+
 # OpenIconic icons bundled via sabre-dav
 Provides:       bundled(openiconic-fonts) = 1.0.0
 # jscolor bundled via themeing app
diff --git a/sources b/sources
index f5f9412..88f9c2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nextcloud-30.0.2.tar.bz2) = 5587fd8a5695b70165bc705cc79294779a7d64e755d8a37e76a13b0f28da3132ea4228615f1fd2ed13727b34d4c03c7fd1965587590aa0dd8847b7a0b00b5fe7
+SHA512 (nextcloud-30.0.4.tar.bz2) = 6686bd86f5a7ede656e46f07580ba0c83db42ba5e2f161074b3cd48bbba80c4836125bb6966e052c35eb332bb43d5df58e29c781a56a2ad6ac8498464aa47aec

From cb014a1f228536789d528dc280e4e59fcb99b413 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jan 2025 20:04:03 +0000
Subject: [PATCH 03/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From 2a1247110d08d327f26aa99dfebe22ebcb6b511e Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Thu, 23 Jan 2025 08:36:12 -0600
Subject: [PATCH 04/32] 30.0.5 Release

---
 nextcloud.spec | 4 ++--
 sources        | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nextcloud.spec b/nextcloud.spec
index a78225e..a5f88ba 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        30.0.4
+Version:        30.0.5
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
@@ -110,7 +110,7 @@ Provides: bundled(php-composer(phpstan/phpdoc-parser)) = 1.29.1
 Provides: bundled(php-composer(icewind/smb)) = 3.5.4
 Provides: bundled(php-composer(icewind/streams)) = 0.7.7
 Provides: bundled(php-composer(bamarni/composer-bin-plugin)) = 1.8.2
-Provides: bundled(php-composer(hexogen/kdtree)) = 0.2.5
+Provides: bundled(php-composer(hexogen/kdtree)) = 0.2.6
 Provides: bundled(php-composer(amphp/amp)) = 2.6.4
 Provides: bundled(php-composer(amphp/byte-stream)) = 1.8.1
 Provides: bundled(php-composer(amphp/parallel)) = 1.4.3
diff --git a/sources b/sources
index 88f9c2d..f276977 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (nextcloud-30.0.4.tar.bz2) = 6686bd86f5a7ede656e46f07580ba0c83db42ba5e2f161074b3cd48bbba80c4836125bb6966e052c35eb332bb43d5df58e29c781a56a2ad6ac8498464aa47aec
+SHA512 (nextcloud-29.0.10.tar.bz2) = 919603f3c1159b4e37d79e1e44bb96957d68384ef0ae60588e152d4d294b06df4d8fab4e7999c965c773ba8c1f1ec974445cf41d64ab1c9aaf65e9c07c606c20
+SHA512 (nextcloud-30.0.5.tar.bz2) = 041e5d9670a376480312db525a5791b703682b0061ca4a2aea2aea481e407ce04a726e1e5ae0c45876c749e18aae7926417b4655f591082954e3945677704910

From 8c7282c8e7b03982337c18098cddfabba21271af Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Thu, 23 Jan 2025 09:09:24 -0600
Subject: [PATCH 05/32] delete bodhi template file

---
 bodhi.template.last | 44 --------------------------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 bodhi.template.last

diff --git a/bodhi.template.last b/bodhi.template.last
deleted file mode 100644
index 8e233c3..0000000
--- a/bodhi.template.last
+++ /dev/null
@@ -1,44 +0,0 @@
-[ nextcloud-30.0.2-1.fc41 ]
-
-# bugfix, security, enhancement, newpackage (required)
-type=enhancement
-
-# testing, stable
-request=testing
-
-# Bug numbers: 1234,9876
-bugs=
-
-# Severity: low, medium, high, urgent
-# This is required for security updates.
-severity=unspecified
-
-display_name=
-
-
-# Here is where you give an explanation of your update.
-# Content can span multiple lines, as long as they are indented deeper than
-# the first line. For example,
-# notes=first line
-#     second line
-#     and so on
-notes=32.0.2 release RHBZ#2319576
-
-# Enable request automation based on the stable/unstable karma thresholds
-autokarma=True
-stable_karma=3
-unstable_karma=-3
-
-# Automatically close bugs when this marked as stable
-close_bugs=True
-
-# Suggest that users performs one of the following actions after the update:
-# unspecified, restart, logout
-# The default value is unspecified
-suggest=unspecified
-
-# A boolean to require that all of the bugs in your update have been confirmed by testers.
-require_bugs=True
-
-# A boolean to require that this update passes all test cases before reaching stable.
-require_testcases=True

From ced6af035171e33879de4d81f24aff7ad1441d07 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Mon, 3 Feb 2025 09:41:01 -0600
Subject: [PATCH 06/32] use composer-generators to autogenerate php-composer
 provides

---
 nextcloud.spec | 134 ++-----------------------------------------------
 1 file changed, 5 insertions(+), 129 deletions(-)

diff --git a/nextcloud.spec b/nextcloud.spec
index a5f88ba..008d8ec 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -51,6 +51,9 @@ BuildRequires:  php(language) >= 8.1
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  sed
 
+# Auto-generate Provides from bundled php-composer libraries
+BuildRequires:  composer-generators
+
 # expand pear macros on install
 BuildRequires:  php-pear
 
@@ -94,136 +97,8 @@ Requires:       php-zip
 # the CA cert bundle is linked to from the config dir
 Requires:       %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
 
-# Bundled composer libraries
-# generated with utils/get-bundled-versions.py
-# tar xf nextcloud-28.0.6.tar.bz2
-# cd nextcloud
-# ../utils/get-bundled-versions.py
-# many of these can be unbundled
-# I think utils/get-composer-requires.py is a tool to check if these are available on Fedora
-Provides: bundled(php-composer(christian-riesen/base32)) = 1.6.0
-Provides: bundled(php-composer(rullzer/easytotp)) = 0.1.4
-Provides: bundled(php-composer(adhocore/cli)) = 1.7.1
-Provides: bundled(php-composer(nextcloud/openapi-extractor)) = 1.0.0
-Provides: bundled(php-composer(nikic/php-parser)) = 5.1.0
-Provides: bundled(php-composer(phpstan/phpdoc-parser)) = 1.29.1
-Provides: bundled(php-composer(icewind/smb)) = 3.5.4
-Provides: bundled(php-composer(icewind/streams)) = 0.7.7
-Provides: bundled(php-composer(bamarni/composer-bin-plugin)) = 1.8.2
-Provides: bundled(php-composer(hexogen/kdtree)) = 0.2.6
-Provides: bundled(php-composer(amphp/amp)) = 2.6.4
-Provides: bundled(php-composer(amphp/byte-stream)) = 1.8.1
-Provides: bundled(php-composer(amphp/parallel)) = 1.4.3
-Provides: bundled(php-composer(amphp/parser)) = 1.1.0
-Provides: bundled(php-composer(amphp/process)) = 1.1.4
-Provides: bundled(php-composer(amphp/serialization)) = 1.0.0
-Provides: bundled(php-composer(amphp/sync)) = 1.4.2
-Provides: bundled(php-composer(bamarni/composer-bin-plugin)) = 1.8.2
-Provides: bundled(php-composer(league/flysystem)) = 2.5.0
-Provides: bundled(php-composer(league/mime-type-detection)) = 1.11.0
-Provides: bundled(php-composer(psr/log)) = 1.1.4
-Provides: bundled(php-composer(rubix/ml)) = 2.1.1
-Provides: bundled(php-composer(rubix/tensor)) = 2.2.3
-Provides: bundled(php-composer(symfony/polyfill-mbstring)) = 1.27.0
-Provides: bundled(php-composer(symfony/polyfill-php73)) = 1.26.0
-Provides: bundled(php-composer(symfony/polyfill-php80)) = 1.27.0
-Provides: bundled(php-composer(aws/aws-crt-php)) = 1.2.5
-Provides: bundled(php-composer(aws/aws-sdk-php)) = 3.311.2
-Provides: bundled(php-composer(bantu/ini-get-wrapper)) = 1.0.1
-Provides: bundled(php-composer(brick/math)) = 0.12.1
-Provides: bundled(php-composer(cweagans/composer-patches)) = 1.7.3
-Provides: bundled(php-composer(deepdiver/zipstreamer)) = 2.0.3
-Provides: bundled(php-composer(deepdiver1975/tarstreamer)) = 2.1.0
-Provides: bundled(php-composer(doctrine/cache)) = 2.2.0
-Provides: bundled(php-composer(doctrine/dbal)) = 3.9.1
-Provides: bundled(php-composer(doctrine/deprecations)) = 1.1.3
-Provides: bundled(php-composer(doctrine/event-manager)) = 2.0.1
-Provides: bundled(php-composer(doctrine/lexer)) = 3.0.1
-Provides: bundled(php-composer(egulias/email-validator)) = 4.0.2
-Provides: bundled(php-composer(fusonic/opengraph)) = 2.3.0
-Provides: bundled(php-composer(giggsey/libphonenumber-for-php-lite)) = 8.13.45
-Provides: bundled(php-composer(guzzlehttp/guzzle)) = 7.8.2
-Provides: bundled(php-composer(guzzlehttp/promises)) = 2.0.4
-Provides: bundled(php-composer(guzzlehttp/psr7)) = 2.7.0
-Provides: bundled(php-composer(guzzlehttp/uri-template)) = 1.0.3
-Provides: bundled(php-composer(icewind/searchdav)) = 3.1.0
-Provides: bundled(php-composer(icewind/streams)) = 0.7.7
-Provides: bundled(php-composer(justinrainbow/json-schema)) = 5.2.13
-Provides: bundled(php-composer(kornrunner/blurhash)) = 1.2.2
-Provides: bundled(php-composer(laravel/serializable-closure)) = 1.3.5
-Provides: bundled(php-composer(lcobucci/clock)) = 3.0.0
-Provides: bundled(php-composer(masterminds/html5)) = 2.9.0
-Provides: bundled(php-composer(mexitek/phpcolors)) = 1.0.4
-Provides: bundled(php-composer(microsoft/azure-storage-blob)) = 1.5.4
-Provides: bundled(php-composer(microsoft/azure-storage-common)) = 1.5.2
-Provides: bundled(php-composer(mlocati/ip-lib)) = 1.18.0
-Provides: bundled(php-composer(mtdowling/jmespath.php)) = 2.7.0
-Provides: bundled(php-composer(nextcloud/lognormalizer)) = 1.0.0
-Provides: bundled(php-composer(paragonie/constant_time_encoding)) = 2.7.0
-Provides: bundled(php-composer(pear/archive_tar)) = 1.5.0
-Provides: bundled(php-composer(pear/console_getopt)) = 1.4.3
-Provides: bundled(php-composer(pear/pear-core-minimal)) = 1.10.15
-Provides: bundled(php-composer(pear/pear_exception)) = 1.0.2
-Provides: bundled(php-composer(php-http/guzzle7-adapter)) = 1.0.0
-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.10.0
-Provides: bundled(php-composer(phpseclib/phpseclib)) = 2.0.47
-Provides: bundled(php-composer(pimple/pimple)) = 3.5.0
-Provides: bundled(php-composer(psr/cache)) = 3.0.0
-Provides: bundled(php-composer(psr/clock)) = 1.0.0
-Provides: bundled(php-composer(psr/container)) = 2.0.2
-Provides: bundled(php-composer(psr/event-dispatcher)) = 1.0.0
-Provides: bundled(php-composer(psr/http-client)) = 1.0.3
-Provides: bundled(php-composer(psr/http-factory)) = 1.1.0
-Provides: bundled(php-composer(psr/http-message)) = 1.1
-Provides: bundled(php-composer(psr/log)) = 2.0.0
-Provides: bundled(php-composer(punic/punic)) = 3.8.1
-Provides: bundled(php-composer(ralouphie/getallheaders)) = 3.0.3
-Provides: bundled(php-composer(sabre/dav)) = 4.6.0
-Provides: bundled(php-composer(sabre/event)) = 5.1.4
-Provides: bundled(php-composer(sabre/http)) = 5.1.10
-Provides: bundled(php-composer(sabre/uri)) = 2.3.3
-Provides: bundled(php-composer(sabre/vobject)) = 4.5.4
-Provides: bundled(php-composer(sabre/xml)) = 2.2.7
-Provides: bundled(php-composer(scssphp/scssphp)) = 1.12.1
-Provides: bundled(php-composer(spomky-labs/cbor-php)) = 3.1.0
-Provides: bundled(php-composer(spomky-labs/pki-framework)) = 1.2.1
-Provides: bundled(php-composer(stecman/symfony-console-completion)) = 0.13.0
-Provides: bundled(php-composer(symfony/console)) = 6.4.12
-Provides: bundled(php-composer(symfony/css-selector)) = 6.4.3
-Provides: bundled(php-composer(symfony/deprecation-contracts)) = 3.5.0
-Provides: bundled(php-composer(symfony/dom-crawler)) = 6.4.4
-Provides: bundled(php-composer(symfony/event-dispatcher)) = 6.4.8
-Provides: bundled(php-composer(symfony/event-dispatcher-contracts)) = 3.0.2
-Provides: bundled(php-composer(symfony/http-foundation)) = 6.4.12
-Provides: bundled(php-composer(symfony/mailer)) = 6.4.12
-Provides: bundled(php-composer(symfony/mime)) = 6.4.12
-Provides: bundled(php-composer(symfony/polyfill-ctype)) = 1.29.0
-Provides: bundled(php-composer(symfony/polyfill-intl-grapheme)) = 1.31.0
-Provides: bundled(php-composer(symfony/polyfill-intl-idn)) = 1.31.0
-Provides: bundled(php-composer(symfony/polyfill-intl-normalizer)) = 1.31.0
-Provides: bundled(php-composer(symfony/polyfill-mbstring)) = 1.31.0
-Provides: bundled(php-composer(symfony/polyfill-php80)) = 1.29.0
-Provides: bundled(php-composer(symfony/polyfill-php83)) = 1.31.0
-Provides: bundled(php-composer(symfony/polyfill-uuid)) = 1.31.0
-Provides: bundled(php-composer(symfony/process)) = 6.4.12
-Provides: bundled(php-composer(symfony/routing)) = 6.4.12
-Provides: bundled(php-composer(symfony/service-contracts)) = 3.0.2
-Provides: bundled(php-composer(symfony/string)) = 6.0.19
-Provides: bundled(php-composer(symfony/translation)) = 6.4.12
-Provides: bundled(php-composer(symfony/translation-contracts)) = 3.4.2
-Provides: bundled(php-composer(symfony/uid)) = 6.4.12
-Provides: bundled(php-composer(wapmorgan/mp3info)) = 0.1.0
-Provides: bundled(php-composer(web-auth/cose-lib)) = 4.4.0
-Provides: bundled(php-composer(web-auth/webauthn-lib)) = 4.9.1
-
-# 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
+Provides:       bundled(jquery-ui-multiselect) = 1.13
 # zxcvbn bundled via core
 Provides:       bundled(zxcvbn) = 4.4.2
 
@@ -274,6 +149,7 @@ If you want the database to be on the same system as NextCloud itself, you must
 also install and enable a MySQL / MariaDB server package. See README.mysql for
 more details.
 
+
 %package postgresql
 Summary:        PostgreSQL database support for NextCloud
 Provides:       %{name}-database = %{version}-%{release}

From 7b50c912fe56ca4f9d83a9240670da71a2971ecd Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Fri, 7 Feb 2025 07:02:02 -0600
Subject: [PATCH 07/32] escape period

---
 nextcloud.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud.spec b/nextcloud.spec
index 008d8ec..8ac8133 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -190,7 +190,7 @@ find . -name .gitignore -type f -delete -print
 find . -name .github    -type d -prune -exec rm -r {} \; -print
 
 # fix CLI upgrade advise on splash screen
-sed -i -e 's#./\(occ upgrade\)#sudo -u apache php /usr/share/nextcloud/\1#' core/templates/update.admin.php
+sed -i -e 's#\./\(occ upgrade\)#sudo -u apache php /usr/share/nextcloud/\1#' core/templates/update.admin.php
 
 # prepare package doc
 cp %{SOURCE300} README.%{distro}

From 05c35a13262ef388c77cb9485fb312c6feec6909 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sun, 2 Mar 2025 16:29:20 -0600
Subject: [PATCH 08/32] 31.0.0 release RHBZ#2324262 RHBZ#2336564

---
 nextcloud.spec | 2 +-
 sources        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud.spec b/nextcloud.spec
index 8ac8133..daa8496 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        30.0.5
+Version:        31.0.0
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
diff --git a/sources b/sources
index f276977..8c8fd4c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nextcloud-29.0.10.tar.bz2) = 919603f3c1159b4e37d79e1e44bb96957d68384ef0ae60588e152d4d294b06df4d8fab4e7999c965c773ba8c1f1ec974445cf41d64ab1c9aaf65e9c07c606c20
-SHA512 (nextcloud-30.0.5.tar.bz2) = 041e5d9670a376480312db525a5791b703682b0061ca4a2aea2aea481e407ce04a726e1e5ae0c45876c749e18aae7926417b4655f591082954e3945677704910
+SHA512 (nextcloud-29.0.12.tar.bz2) = 10a5bbc61d2a85090aaa6174eac415337b63adaf23e8044d25c674d0ce8d6bcfff949d3950abd369ecfa2c2b9c4a747d0744a47777bc3d51799804b696579a6e
+SHA512 (nextcloud-31.0.0.tar.bz2) = e9311423ba42c9f3d30b455fe47105f216262cc75dd7ea227fb939bfd10c3614b84e9aef1da6b3737fc0c0fe136d4ebe19107f8b97da5fd3910a47f7b2811eb1

From ab682ab5e57c171728a97c6faf8c68dabfca5da7 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Tue, 25 Mar 2025 12:07:53 -0500
Subject: [PATCH 09/32] 31.0.2 release RHBZ#2345769 RHBZ#2345775 RHBZ#2350414

---
 nextcloud.spec                             |  4 +--
 nextcloud30-integritycheck-exclusion.patch | 34 ++++++++++++++++++++++
 sources                                    |  2 +-
 3 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 nextcloud30-integritycheck-exclusion.patch

diff --git a/nextcloud.spec b/nextcloud.spec
index daa8496..15efeb8 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        31.0.0
+Version:        31.0.2
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
@@ -41,7 +41,7 @@ Source303:      %{name}-MIGRATION.fedora
 # version are possible
 Patch0:         0000-disable-update-version-check.patch
 # Add the ability to exclude files we specify from the nextcloud integrity checker
-Patch1:         nextcloud-integritycheck-exclusion.patch
+Patch1:         nextcloud30-integritycheck-exclusion.patch
 
 BuildArch:      noarch
 
diff --git a/nextcloud30-integritycheck-exclusion.patch b/nextcloud30-integritycheck-exclusion.patch
new file mode 100644
index 0000000..eeb7ee5
--- /dev/null
+++ b/nextcloud30-integritycheck-exclusion.patch
@@ -0,0 +1,34 @@
+From 9f38c6300712a23ccdc75e140143a1c461e15705 Mon Sep 17 00:00:00 2001
+From: Andrew Bauer <zonexpertconsulting@outlook.com>
+Date: Mon, 24 Jun 2024 10:11:23 -0500
+Subject: [PATCH] silence integrity check for excluded files
+
+---
+ lib/private/IntegrityCheck/Checker.php | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php
+index a6de3cf6030d7..3974483601b08 100644
+--- a/lib/private/IntegrityCheck/Checker.php
++++ b/lib/private/IntegrityCheck/Checker.php
+@@ -337,7 +337,20 @@ private function verify(string $signaturePath, string $basePath, string $certifi
+ 		$differencesB = array_diff_assoc($currentInstanceHashes, $expectedHashes);
+ 		$differences = array_unique(array_merge($differencesA, $differencesB));
+ 		$differenceArray = [];
++
++		# Nasty hack to silence the integrity checker for files patched during the build process or files we simply don't care about
++		$excludedFilenames = [
++//sedplaceholder			];
++
+ 		foreach ($differences as $filename => $hash) {
++
++			# Skip if the file in question matches our exclusion list
++			foreach ($excludedFilenames as $excludedFilename) {
++			  if (strpos($filename, $excludedFilename)!==false) {
++			    break 2;
++			  }
++			}
++
+ 			// Check if file should not exist in the new signature table
+ 			if (!array_key_exists($filename, $expectedHashes)) {
+ 				$differenceArray['EXTRA_FILE'][$filename]['expected'] = '';
diff --git a/sources b/sources
index 8c8fd4c..ef43f4b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (nextcloud-29.0.12.tar.bz2) = 10a5bbc61d2a85090aaa6174eac415337b63adaf23e8044d25c674d0ce8d6bcfff949d3950abd369ecfa2c2b9c4a747d0744a47777bc3d51799804b696579a6e
-SHA512 (nextcloud-31.0.0.tar.bz2) = e9311423ba42c9f3d30b455fe47105f216262cc75dd7ea227fb939bfd10c3614b84e9aef1da6b3737fc0c0fe136d4ebe19107f8b97da5fd3910a47f7b2811eb1
+SHA512 (nextcloud-31.0.2.tar.bz2) = bef29a4fdde468ae61b7d504b1f6d2bb031841edf97837116025d0966f812be95fff1ab7e02105cdf8250de11c62f82d89f08bcae30d4dd91d10694f7b267e4c

From 7ab2f104e88d711eddcaa4b89d95210a89407fa6 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sat, 19 Apr 2025 07:53:07 -0500
Subject: [PATCH 10/32] 31.04 release RHBZ#2359048

---
 nextcloud-integritycheck-exclusion.patch   |  2 +-
 nextcloud.spec                             |  4 +--
 nextcloud30-integritycheck-exclusion.patch | 34 ----------------------
 sources                                    |  4 +--
 4 files changed, 5 insertions(+), 39 deletions(-)
 delete mode 100644 nextcloud30-integritycheck-exclusion.patch

diff --git a/nextcloud-integritycheck-exclusion.patch b/nextcloud-integritycheck-exclusion.patch
index 766cf1c..eeb7ee5 100644
--- a/nextcloud-integritycheck-exclusion.patch
+++ b/nextcloud-integritycheck-exclusion.patch
@@ -12,7 +12,7 @@ index a6de3cf6030d7..3974483601b08 100644
 --- a/lib/private/IntegrityCheck/Checker.php
 +++ b/lib/private/IntegrityCheck/Checker.php
 @@ -337,7 +337,20 @@ private function verify(string $signaturePath, string $basePath, string $certifi
- 		$differencesB = array_diff($currentInstanceHashes, $expectedHashes);
+ 		$differencesB = array_diff_assoc($currentInstanceHashes, $expectedHashes);
  		$differences = array_unique(array_merge($differencesA, $differencesB));
  		$differenceArray = [];
 +
diff --git a/nextcloud.spec b/nextcloud.spec
index 15efeb8..33d0cec 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        31.0.2
+Version:        31.0.4
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
@@ -41,7 +41,7 @@ Source303:      %{name}-MIGRATION.fedora
 # version are possible
 Patch0:         0000-disable-update-version-check.patch
 # Add the ability to exclude files we specify from the nextcloud integrity checker
-Patch1:         nextcloud30-integritycheck-exclusion.patch
+Patch1:         nextcloud-integritycheck-exclusion.patch
 
 BuildArch:      noarch
 
diff --git a/nextcloud30-integritycheck-exclusion.patch b/nextcloud30-integritycheck-exclusion.patch
deleted file mode 100644
index eeb7ee5..0000000
--- a/nextcloud30-integritycheck-exclusion.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9f38c6300712a23ccdc75e140143a1c461e15705 Mon Sep 17 00:00:00 2001
-From: Andrew Bauer <zonexpertconsulting@outlook.com>
-Date: Mon, 24 Jun 2024 10:11:23 -0500
-Subject: [PATCH] silence integrity check for excluded files
-
----
- lib/private/IntegrityCheck/Checker.php | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php
-index a6de3cf6030d7..3974483601b08 100644
---- a/lib/private/IntegrityCheck/Checker.php
-+++ b/lib/private/IntegrityCheck/Checker.php
-@@ -337,7 +337,20 @@ private function verify(string $signaturePath, string $basePath, string $certifi
- 		$differencesB = array_diff_assoc($currentInstanceHashes, $expectedHashes);
- 		$differences = array_unique(array_merge($differencesA, $differencesB));
- 		$differenceArray = [];
-+
-+		# Nasty hack to silence the integrity checker for files patched during the build process or files we simply don't care about
-+		$excludedFilenames = [
-+//sedplaceholder			];
-+
- 		foreach ($differences as $filename => $hash) {
-+
-+			# Skip if the file in question matches our exclusion list
-+			foreach ($excludedFilenames as $excludedFilename) {
-+			  if (strpos($filename, $excludedFilename)!==false) {
-+			    break 2;
-+			  }
-+			}
-+
- 			// Check if file should not exist in the new signature table
- 			if (!array_key_exists($filename, $expectedHashes)) {
- 				$differenceArray['EXTRA_FILE'][$filename]['expected'] = '';
diff --git a/sources b/sources
index ef43f4b..6958260 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nextcloud-29.0.12.tar.bz2) = 10a5bbc61d2a85090aaa6174eac415337b63adaf23e8044d25c674d0ce8d6bcfff949d3950abd369ecfa2c2b9c4a747d0744a47777bc3d51799804b696579a6e
-SHA512 (nextcloud-31.0.2.tar.bz2) = bef29a4fdde468ae61b7d504b1f6d2bb031841edf97837116025d0966f812be95fff1ab7e02105cdf8250de11c62f82d89f08bcae30d4dd91d10694f7b267e4c
+SHA512 (nextcloud-29.0.8.tar.bz2) = ec99d5efc6a573627cae9b42f7f34e3c8ee7ba9bc3bfe1bb032c9e8fcef2831ce32f7dcb72c3303582b205de390619bd7f892a7bc4415c0826e02f73496714b0
+SHA512 (nextcloud-31.0.4.tar.bz2) = 85535638556b9f727989cc1baceec8a89ef52a6f7dc132ad807326492ffc904bc3f462afea18dd0749bb8c194ef57932dcbfd494e8290a6f7b0f5d224e69429d

From f3e2eb421823de4ccb100fa3a792028fddde7661 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Mon, 26 May 2025 08:02:07 -0500
Subject: [PATCH 11/32] 31.0.5 release RHBZ#2364462 RHBZ#2366729 RHBZ#2366735

---
 nextcloud.spec | 2 +-
 sources        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud.spec b/nextcloud.spec
index 33d0cec..c5d688c 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        31.0.4
+Version:        31.0.5
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
diff --git a/sources b/sources
index 6958260..decbc7a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nextcloud-29.0.8.tar.bz2) = ec99d5efc6a573627cae9b42f7f34e3c8ee7ba9bc3bfe1bb032c9e8fcef2831ce32f7dcb72c3303582b205de390619bd7f892a7bc4415c0826e02f73496714b0
-SHA512 (nextcloud-31.0.4.tar.bz2) = 85535638556b9f727989cc1baceec8a89ef52a6f7dc132ad807326492ffc904bc3f462afea18dd0749bb8c194ef57932dcbfd494e8290a6f7b0f5d224e69429d
+SHA512 (nextcloud-29.0.16.tar.bz2) = e786dec5973f8184b20915b3e0ec80c316c636c70537932e7302ccc905389cda6b344ef73d44fa7ce74b75d36ee1f9a6f1f8851c29faf29774d1bd3d3cb05a00
+SHA512 (nextcloud-31.0.5.tar.bz2) = 9ec0dc1e1301e53293b199d1709165346a66fd33ec918b21fc94ef7a10187f863f8e3aa35ec90fe99b11db7b0309f858b1c9d0d5d5e3c13f249d3055f08631d7

From 9dc14f5076817c55563496cf8ddcb0d8ece82976 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sat, 5 Jul 2025 20:23:32 -0500
Subject: [PATCH 12/32] 31.0.6 release RHBZ#2372407

---
 nextcloud.spec | 2 +-
 sources        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud.spec b/nextcloud.spec
index c5d688c..42263f0 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        31.0.5
+Version:        31.0.6
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
diff --git a/sources b/sources
index decbc7a..fe9f043 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (nextcloud-29.0.16.tar.bz2) = e786dec5973f8184b20915b3e0ec80c316c636c70537932e7302ccc905389cda6b344ef73d44fa7ce74b75d36ee1f9a6f1f8851c29faf29774d1bd3d3cb05a00
-SHA512 (nextcloud-31.0.5.tar.bz2) = 9ec0dc1e1301e53293b199d1709165346a66fd33ec918b21fc94ef7a10187f863f8e3aa35ec90fe99b11db7b0309f858b1c9d0d5d5e3c13f249d3055f08631d7
+SHA512 (nextcloud-31.0.6.tar.bz2) = 9a98cca509bb3edfa7a49038be9de483b46e8b3b0dcf8a2cfac669fa569d41e8f66a922ad638bc8c683b9df9f144946d0e39e44d2ba9408f7401da3dbcc13ad3

From 7d4cd2558adbbf4bb311d8b72681bde5e959bdc6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 24 Jul 2025 22:48:11 +0000
Subject: [PATCH 13/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From cff27361a1176d40e10767d67d52d704ab6b76ea Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sun, 3 Aug 2025 16:03:15 -0500
Subject: [PATCH 14/32] 31.0.7 release, fix link to cert bundle RHBZ#2372407
 RHBZ#2383716

---
 nextcloud.spec | 9 +++++----
 sources        | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/nextcloud.spec b/nextcloud.spec
index 42263f0..45569ea 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        31.0.6
+Version:        31.0.7
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
@@ -94,8 +94,9 @@ Requires:       php-xmlwriter
 Requires:       php-zip
 # 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
+# Fedora dropped legacy CA cert bundle symlinks
+# See https://fedoraproject.org/wiki/Changes/dropingOfCertPemFile
+Requires:       %{_sysconfdir}/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
 
 # jquery-ui-multiselect bundled via user_ldap app
 Provides:       bundled(jquery-ui-multiselect) = 1.13
@@ -285,7 +286,7 @@ install -pm 755 occ %{buildroot}%{_datadir}/%{name}
 ln -s ../../../%{_sysconfdir}/%{name} %{buildroot}%{_datadir}/%{name}/config
 
 # nextcloud looks for ca-bundle.crt in config dir
-ln -s ../pki/tls/certs/ca-bundle.crt %{buildroot}%{_sysconfdir}/%{name}/ca-bundle.crt
+ln -s ../pki/ca-trust/extracted/pem/tls-ca-bundle.pem %{buildroot}%{_sysconfdir}/%{name}/ca-bundle.crt
 
 # set default config
 install -pm 644 %{SOURCE1}    %{buildroot}%{_sysconfdir}/%{name}/config.php
diff --git a/sources b/sources
index fe9f043..8b6dd3f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (nextcloud-29.0.16.tar.bz2) = e786dec5973f8184b20915b3e0ec80c316c636c70537932e7302ccc905389cda6b344ef73d44fa7ce74b75d36ee1f9a6f1f8851c29faf29774d1bd3d3cb05a00
-SHA512 (nextcloud-31.0.6.tar.bz2) = 9a98cca509bb3edfa7a49038be9de483b46e8b3b0dcf8a2cfac669fa569d41e8f66a922ad638bc8c683b9df9f144946d0e39e44d2ba9408f7401da3dbcc13ad3
+SHA512 (nextcloud-31.0.7.tar.bz2) = 1ba66c016e53f9dfc94a8a02404c225b16f666d7c9427e8e5e7ac5e437dc85921d3647c1626c0eaf5326ffafd2c0f7cc44b9ddbca1f324ccc39e15abd52b90a4

From f2672121791060ab225ff8e2b3e84f36b8c32335 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sat, 20 Sep 2025 14:28:40 -0500
Subject: [PATCH 15/32] 31.0.9 release RHBZ#2388493 RHBZ#2389830 RHBZ#2389831
 RHBZ#2389842 RHBZ#2389843 RHBZ#2389814 RHBZ#2389815

---
 nextcloud.spec | 2 +-
 sources        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud.spec b/nextcloud.spec
index 45569ea..abe44e3 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        31.0.7
+Version:        31.0.9
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
diff --git a/sources b/sources
index 8b6dd3f..a73a0a5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (nextcloud-29.0.16.tar.bz2) = e786dec5973f8184b20915b3e0ec80c316c636c70537932e7302ccc905389cda6b344ef73d44fa7ce74b75d36ee1f9a6f1f8851c29faf29774d1bd3d3cb05a00
-SHA512 (nextcloud-31.0.7.tar.bz2) = 1ba66c016e53f9dfc94a8a02404c225b16f666d7c9427e8e5e7ac5e437dc85921d3647c1626c0eaf5326ffafd2c0f7cc44b9ddbca1f324ccc39e15abd52b90a4
+SHA512 (nextcloud-31.0.9.tar.bz2) = eec86ab5b45cc3a4ee0208e1bb0ae8ddf04d35956ca8aef92f79d7109c9c5d2f58916c32c341883c10713f861c092050b568f577fcad754e45928ac4e21828ea

From d625665feba08e907c0200f9a273606f0b410c91 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sat, 25 Oct 2025 15:31:28 -0500
Subject: [PATCH 16/32] 32.0.1 release RHBZ#2399899

---
 0000-disable-update-version-check.patch | 18 +++++-------------
 nextcloud.spec                          |  2 +-
 sources                                 |  2 +-
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/0000-disable-update-version-check.patch b/0000-disable-update-version-check.patch
index 2d5828b..6c84ac2 100644
--- a/0000-disable-update-version-check.patch
+++ b/0000-disable-update-version-check.patch
@@ -1,8 +1,6 @@
-diff --git a/lib/private/Updater.php b/lib/private/Updater.php
-index 5a14bb17507..38dcb55db7f 100644
---- a/lib/private/Updater.php
-+++ b/lib/private/Updater.php
-@@ -214,15 +214,17 @@ class Updater extends BasicEmitter {
+--- a/lib/private/Updater.php	2025-10-23 13:34:14.000000000 -0500
++++ b/lib/private/Updater.new.php	2025-10-25 15:04:23.345653512 -0500
+@@ -174,10 +174,13 @@
  			$this->config->setAppValue('core', 'vendor', $currentVendor);
  		}
  
@@ -13,15 +11,9 @@ index 5a14bb17507..38dcb55db7f 100644
 +		*/
  		if ($currentVendor === 'nextcloud') {
 -			return isset($allowedPreviousVersions[$currentVendor][$majorMinor])
--				&& (version_compare($oldVersion, $newVersion, '<=') ||
--					$this->config->getSystemValueBool('debug', false));
+-				&& (version_compare($oldVersion, $newVersion, '<=')
+-					|| $this->config->getSystemValueBool('debug', false));
 +			return true;
  		}
  
  		// Check if the instance can be migrated
--		return isset($allowedPreviousVersions[$currentVendor][$majorMinor]) ||
--			isset($allowedPreviousVersions[$currentVendor][$oldVersion]);
-+		return true;
- 	}
- 
- 	/**
diff --git a/nextcloud.spec b/nextcloud.spec
index abe44e3..1a2448c 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        31.0.9
+Version:        32.0.1
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
diff --git a/sources b/sources
index a73a0a5..d555484 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (nextcloud-29.0.16.tar.bz2) = e786dec5973f8184b20915b3e0ec80c316c636c70537932e7302ccc905389cda6b344ef73d44fa7ce74b75d36ee1f9a6f1f8851c29faf29774d1bd3d3cb05a00
-SHA512 (nextcloud-31.0.9.tar.bz2) = eec86ab5b45cc3a4ee0208e1bb0ae8ddf04d35956ca8aef92f79d7109c9c5d2f58916c32c341883c10713f861c092050b568f577fcad754e45928ac4e21828ea
+SHA512 (nextcloud-32.0.1.tar.bz2) = 60d38187896537c4736eee381d2f579b35e376c931590a63d0cf5690c0d9b553dda3ba575a06e7448ac156d41aae10f1f02b8e0f2ef3d99275049f38acc987f6

From c34e89c698b02e65b7169b178e263f0f63095ce0 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sun, 23 Nov 2025 19:43:04 -0600
Subject: [PATCH 17/32] 32.0.2 release RHBZ#2416087 RHBZ#2415750 RHBZ#2415751
 RHBZ#2415752 RHBZ#2415753

---
 0000-disable-update-version-check.patch |  6 ++--
 bodhi.template.last                     | 44 +++++++++++++++++++++++++
 nextcloud.spec                          |  2 +-
 sources                                 |  3 +-
 4 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 bodhi.template.last

diff --git a/0000-disable-update-version-check.patch b/0000-disable-update-version-check.patch
index 6c84ac2..4a77733 100644
--- a/0000-disable-update-version-check.patch
+++ b/0000-disable-update-version-check.patch
@@ -1,5 +1,7 @@
---- a/lib/private/Updater.php	2025-10-23 13:34:14.000000000 -0500
-+++ b/lib/private/Updater.new.php	2025-10-25 15:04:23.345653512 -0500
+diff --git a/lib/private/Updater.php b/lib/private/Updater.php
+index 5a14bb17507..38dcb55db7f 100644
+--- a/lib/private/Updater.php
++++ b/lib/private/Updater.php
 @@ -174,10 +174,13 @@
  			$this->config->setAppValue('core', 'vendor', $currentVendor);
  		}
diff --git a/bodhi.template.last b/bodhi.template.last
new file mode 100644
index 0000000..25aead3
--- /dev/null
+++ b/bodhi.template.last
@@ -0,0 +1,44 @@
+[ nextcloud-31.0.7-1.fc41 ]
+
+# bugfix, security, enhancement, newpackage (required)
+type=bugfix
+
+# testing, stable
+request=testing
+
+# Bug numbers: 1234,9876
+bugs=2372407,2383716
+
+# Severity: low, medium, high, urgent
+# This is required for security updates.
+severity=unspecified
+
+display_name=
+
+
+# Here is where you give an explanation of your update.
+# Content can span multiple lines, as long as they are indented deeper than
+# the first line. For example,
+# notes=first line
+#     second line
+#     and so on
+notes=31.0.7 release, fix link to cert bundle RHBZ#2372407 RHBZ#2383716
+
+# Enable request automation based on the stable/unstable karma thresholds
+autokarma=True
+stable_karma=3
+unstable_karma=-3
+
+# Automatically close bugs when this marked as stable
+close_bugs=True
+
+# Suggest that users performs one of the following actions after the update:
+# unspecified, restart, logout
+# The default value is unspecified
+suggest=unspecified
+
+# A boolean to require that all of the bugs in your update have been confirmed by testers.
+require_bugs=True
+
+# A boolean to require that this update passes all test cases before reaching stable.
+require_testcases=True
diff --git a/nextcloud.spec b/nextcloud.spec
index 1a2448c..3e3feae 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        32.0.1
+Version:        32.0.2
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
diff --git a/sources b/sources
index d555484..c882ebb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (nextcloud-29.0.16.tar.bz2) = e786dec5973f8184b20915b3e0ec80c316c636c70537932e7302ccc905389cda6b344ef73d44fa7ce74b75d36ee1f9a6f1f8851c29faf29774d1bd3d3cb05a00
-SHA512 (nextcloud-32.0.1.tar.bz2) = 60d38187896537c4736eee381d2f579b35e376c931590a63d0cf5690c0d9b553dda3ba575a06e7448ac156d41aae10f1f02b8e0f2ef3d99275049f38acc987f6
+SHA512 (nextcloud-32.0.2.tar.bz2) = b99679a6e57930beda2fd76cc77e0daffff42d8f47714cd2877c5fcea50875f421895e491c591148907734196c2db00d0f57e798f52f2ae5680ad999022144f1

From d67faf73acf1a3b4de8df970f0732d491831838a Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Fri, 12 Dec 2025 08:30:53 -0600
Subject: [PATCH 18/32] 32.0.3 release, fixes RHBZ# 2420196 RHBZ# 2420197 RHBZ#
 2420198 RHBZ# 2421368

---
 bodhi.template.last | 44 --------------------------------------------
 nextcloud.spec      |  2 +-
 sources             |  2 +-
 3 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 bodhi.template.last

diff --git a/bodhi.template.last b/bodhi.template.last
deleted file mode 100644
index 25aead3..0000000
--- a/bodhi.template.last
+++ /dev/null
@@ -1,44 +0,0 @@
-[ nextcloud-31.0.7-1.fc41 ]
-
-# bugfix, security, enhancement, newpackage (required)
-type=bugfix
-
-# testing, stable
-request=testing
-
-# Bug numbers: 1234,9876
-bugs=2372407,2383716
-
-# Severity: low, medium, high, urgent
-# This is required for security updates.
-severity=unspecified
-
-display_name=
-
-
-# Here is where you give an explanation of your update.
-# Content can span multiple lines, as long as they are indented deeper than
-# the first line. For example,
-# notes=first line
-#     second line
-#     and so on
-notes=31.0.7 release, fix link to cert bundle RHBZ#2372407 RHBZ#2383716
-
-# Enable request automation based on the stable/unstable karma thresholds
-autokarma=True
-stable_karma=3
-unstable_karma=-3
-
-# Automatically close bugs when this marked as stable
-close_bugs=True
-
-# Suggest that users performs one of the following actions after the update:
-# unspecified, restart, logout
-# The default value is unspecified
-suggest=unspecified
-
-# A boolean to require that all of the bugs in your update have been confirmed by testers.
-require_bugs=True
-
-# A boolean to require that this update passes all test cases before reaching stable.
-require_testcases=True
diff --git a/nextcloud.spec b/nextcloud.spec
index 3e3feae..a218dcb 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        32.0.2
+Version:        32.0.3
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
diff --git a/sources b/sources
index c882ebb..af1201e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nextcloud-32.0.2.tar.bz2) = b99679a6e57930beda2fd76cc77e0daffff42d8f47714cd2877c5fcea50875f421895e491c591148907734196c2db00d0f57e798f52f2ae5680ad999022144f1
+SHA512 (nextcloud-32.0.3.tar.bz2) = fd06cd687ddfcb0baac2e0b03db690d1b4f9119e28c5cfbd26d911b214240f8273d7a805540afe83f7cc92f1377487c82fe65eb0b22ad9028410652ec55381fb

From cd2bac1d17a835a19febbedb3c901aa35102d71f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 16 Jan 2026 22:05:49 +0000
Subject: [PATCH 19/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild


From 44fa2177d734f9cd1970bf258bc0d9bdec4f07ef Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sat, 17 Jan 2026 09:16:59 -0600
Subject: [PATCH 20/32] 32.0.5 Release RHBZ#2430382

---
 nextcloud.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud.spec b/nextcloud.spec
index a218dcb..e8ec719 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        32.0.3
+Version:        32.0.5
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.

From c4d346f41d7e3c7a73a89f208286a21ebc6003a6 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sat, 17 Jan 2026 09:32:35 -0600
Subject: [PATCH 21/32] 32.0.5 Release RHBZ#2430382

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index af1201e..89dd67a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nextcloud-32.0.3.tar.bz2) = fd06cd687ddfcb0baac2e0b03db690d1b4f9119e28c5cfbd26d911b214240f8273d7a805540afe83f7cc92f1377487c82fe65eb0b22ad9028410652ec55381fb
+SHA512 (nextcloud-32.0.5.tar.bz2) = 2fbae319f5208c34415c4663078489f86d2ff9c1ecc1b7a0ebb85d07088ded6903302baf20a990355c9ff7139579fe85bb97909b9e013271ec4465c04f6306b9

From 5fb288a672722ddc9310f84e372cede87e210dff Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sat, 21 Feb 2026 16:07:58 -0600
Subject: [PATCH 22/32] 32.0.6 release RHBZ#2440650

---
 nextcloud.spec | 2 +-
 sources        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud.spec b/nextcloud.spec
index e8ec719..baeabf3 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        32.0.5
+Version:        32.0.6
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
diff --git a/sources b/sources
index 89dd67a..382e415 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nextcloud-32.0.5.tar.bz2) = 2fbae319f5208c34415c4663078489f86d2ff9c1ecc1b7a0ebb85d07088ded6903302baf20a990355c9ff7139579fe85bb97909b9e013271ec4465c04f6306b9
+SHA512 (nextcloud-32.0.6.tar.bz2) = f68b80a5444452594e37ca81721c8b529f268db874a2fac104bb27b0ec7a7aa529240b3ea6e3b24c5ef596b4490558e6c426c8aa79df4a2bb11ba37303e91de4

From a31e3cccd8b957affa085837dc47a3421a5170be Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sun, 29 Mar 2026 15:42:22 -0500
Subject: [PATCH 23/32] 33.0.1 release RHBZ#2451773

---
 nextcloud.spec | 5 +----
 sources        | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/nextcloud.spec b/nextcloud.spec
index baeabf3..22e49c6 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        32.0.6
+Version:        33.0.1
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
@@ -190,9 +190,6 @@ find . -name \*.orig    -type f -delete -print
 find . -name .gitignore -type f -delete -print
 find . -name .github    -type d -prune -exec rm -r {} \; -print
 
-# fix CLI upgrade advise on splash screen
-sed -i -e 's#\./\(occ upgrade\)#sudo -u apache php /usr/share/nextcloud/\1#' core/templates/update.admin.php
-
 # prepare package doc
 cp %{SOURCE300} README.%{distro}
 cp %{SOURCE301} README.mysql
diff --git a/sources b/sources
index 382e415..12129b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nextcloud-32.0.6.tar.bz2) = f68b80a5444452594e37ca81721c8b529f268db874a2fac104bb27b0ec7a7aa529240b3ea6e3b24c5ef596b4490558e6c426c8aa79df4a2bb11ba37303e91de4
+SHA512 (nextcloud-33.0.1.tar.bz2) = ba9bcd79005a6aede0750203e062edf68791cf8929aee1d8ff42cfb8636d6aa691b53b72d8bbafc6924fb469aae7d6ea9f8a6c7d1c0ec2ae868853130f404deb

From 0224438526693f5f6827fe9f6d7444443eca8278 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sat, 18 Apr 2026 07:49:00 -0500
Subject: [PATCH 24/32] fix cli upgrade advice

---
 nextcloud.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nextcloud.spec b/nextcloud.spec
index 22e49c6..a4d356f 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -190,6 +190,9 @@ find . -name \*.orig    -type f -delete -print
 find . -name .gitignore -type f -delete -print
 find . -name .github    -type d -prune -exec rm -r {} \; -print
 
+# fix CLI upgrade advice on splash screen            
+sed -i -e 's#\./\(occ upgrade\)#sudo -u apache php /usr/share/nextcloud/\1#' core/src/views/UpdaterAdmin.vue
+
 # prepare package doc
 cp %{SOURCE300} README.%{distro}
 cp %{SOURCE301} README.mysql

From 5c14182672567d934cf490385f85467c051bb432 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sat, 2 May 2026 11:06:29 -0500
Subject: [PATCH 25/32] 33.0.3 Release RHBZ#2454311

---
 nextcloud.spec | 4 ++--
 sources        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud.spec b/nextcloud.spec
index a4d356f..492d018 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        33.0.1
+Version:        33.0.3
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
@@ -191,7 +191,7 @@ find . -name .gitignore -type f -delete -print
 find . -name .github    -type d -prune -exec rm -r {} \; -print
 
 # fix CLI upgrade advice on splash screen            
-sed -i -e 's#\./\(occ upgrade\)#sudo -u apache php /usr/share/nextcloud/\1#' core/src/views/UpdaterAdmin.vue
+sed -i -e 's#\./\(occ upgrade\)#sudo -u apache php /usr/share/nextcloud/\1#' dist/9396-9396.js.map
 
 # prepare package doc
 cp %{SOURCE300} README.%{distro}
diff --git a/sources b/sources
index 12129b9..2d982a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nextcloud-33.0.1.tar.bz2) = ba9bcd79005a6aede0750203e062edf68791cf8929aee1d8ff42cfb8636d6aa691b53b72d8bbafc6924fb469aae7d6ea9f8a6c7d1c0ec2ae868853130f404deb
+SHA512 (nextcloud-33.0.3.tar.bz2) = c41aea23c0b45acfca8bf16101acb4c3559ab6179ac75f668a3c8bb7f3d3029fb539278e1e0e49e405fc0dfa905b15dfa58ec52866f9fd3e57aed07f65d33f66

From 796f9d876b38b71d5b6b90a3c5cd9d2579876b62 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Thu, 28 May 2026 13:32:26 -0500
Subject: [PATCH 26/32] 33.0.4 Release RHBZ#2482794

---
 nextcloud.spec | 2 +-
 sources        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud.spec b/nextcloud.spec
index 492d018..fc39390 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        33.0.3
+Version:        33.0.4
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
diff --git a/sources b/sources
index 2d982a8..a4e16a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nextcloud-33.0.3.tar.bz2) = c41aea23c0b45acfca8bf16101acb4c3559ab6179ac75f668a3c8bb7f3d3029fb539278e1e0e49e405fc0dfa905b15dfa58ec52866f9fd3e57aed07f65d33f66
+SHA512 (nextcloud-33.0.4.tar.bz2) = feec88f83d9babe2db5e5a12948a3e62da2ffe69efae950ae8b8a4dea6b0c9ac5ae66966891e7bf1cc015cb38f2c46922479c497fbf8ecdd33d60459d07599e3

From b701ace299de643e7eed810f088dddd094f6ae23 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Mon, 8 Jun 2026 09:23:08 -0500
Subject: [PATCH 27/32] 33.0.5 Release

---
 nextcloud.spec | 2 +-
 sources        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud.spec b/nextcloud.spec
index fc39390..818c9c5 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        33.0.4
+Version:        33.0.5
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
diff --git a/sources b/sources
index a4e16a9..ef5ff3e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nextcloud-33.0.4.tar.bz2) = feec88f83d9babe2db5e5a12948a3e62da2ffe69efae950ae8b8a4dea6b0c9ac5ae66966891e7bf1cc015cb38f2c46922479c497fbf8ecdd33d60459d07599e3
+SHA512 (nextcloud-33.0.5.tar.bz2) = 495608dd47435cbaa9283f5a168d633bbbb9edfbe216bf867e16826a60c33334d95d2ae484eb3a3b74271012dd65c9bd8a840c3a229e7a5bfb3caf934a40f8d0

From db98a32e0976669cc464ff2f69d8b0b69e586662 Mon Sep 17 00:00:00 2001
From: "Brian J. Murrell" <brian@interlinx.bc.ca>
Date: Tue, 9 Jun 2026 22:31:01 +0000
Subject: [PATCH 28/32] Dynamically determine which .map file to update the occ
 upgrade command in

Currently, the .map file in which the message exists to inform the user
how to run the occ upgrade command is hard-coded.  This can change
from release to release and thus is quite fragile.

Instead, figure out which file to update by searching for the "occ upgrade"
command in all of the .map files and use the result of that search in the
update command.

Signed-off-by: Brian J. Murrell <brian@interlinx.bc.ca>
---
 nextcloud.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nextcloud.spec b/nextcloud.spec
index 818c9c5..6c9d878 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -191,7 +191,12 @@ find . -name .gitignore -type f -delete -print
 find . -name .github    -type d -prune -exec rm -r {} \; -print
 
 # fix CLI upgrade advice on splash screen            
-sed -i -e 's#\./\(occ upgrade\)#sudo -u apache php /usr/share/nextcloud/\1#' dist/9396-9396.js.map
+if ! file=$(grep -l 'occ upgrade' dist/*.map); then
+    echo "Could not find the occ upgrade instructions in dist/*.map"
+    exit 1
+fi
+echo "Updating occ upgrade instructions in $file"
+sed -i -e 's#\./\(occ upgrade\)#sudo -u apache php /usr/share/nextcloud/\1#' $file
 
 # prepare package doc
 cp %{SOURCE300} README.%{distro}

From f0ed8f15a9ff2e5dcd7f02fe8a9f67f47524ead6 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Fri, 26 Jun 2026 14:53:11 -0500
Subject: [PATCH 29/32] 33.0.6 release

---
 nextcloud.spec | 4 ++--
 sources        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud.spec b/nextcloud.spec
index 6c9d878..9583da9 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        33.0.5
+Version:        33.0.6
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
@@ -47,7 +47,7 @@ BuildArch:      noarch
 
 # Set this to the minimum supported php version Nextcloud will run on
 # Exists to prevent accidental building on distros with outdated php's
-BuildRequires:  php(language) >= 8.1
+BuildRequires:  php(language) >= 8.2
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  sed
 
diff --git a/sources b/sources
index ef5ff3e..2336b55 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nextcloud-33.0.5.tar.bz2) = 495608dd47435cbaa9283f5a168d633bbbb9edfbe216bf867e16826a60c33334d95d2ae484eb3a3b74271012dd65c9bd8a840c3a229e7a5bfb3caf934a40f8d0
+SHA512 (nextcloud-33.0.6.tar.bz2) = a72a7b9134a031800e45bf14f71821df855ebad7f00a19c96ddbed438143cea7d03f03e84a5ef196c5da00a8f75b2645b453e794b0df399b820db94aba73c1c5

From eb3b5fd33ec19d93b282c3282d9eb069100ada7a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jul 2026 09:32:38 +0000
Subject: [PATCH 30/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild


From 4f892068ec2e95acfd5f8cc5342a318114c65c8f Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Thu, 23 Jul 2026 15:22:49 -0500
Subject: [PATCH 31/32] 34.0.2 release RHBZ#2506423

---
 nextcloud.spec | 2 +-
 sources        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud.spec b/nextcloud.spec
index 9583da9..aca470b 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        33.0.6
+Version:        34.0.2
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
diff --git a/sources b/sources
index 2336b55..bcdec3c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nextcloud-33.0.6.tar.bz2) = a72a7b9134a031800e45bf14f71821df855ebad7f00a19c96ddbed438143cea7d03f03e84a5ef196c5da00a8f75b2645b453e794b0df399b820db94aba73c1c5
+SHA512 (nextcloud-34.0.2.tar.bz2) = fa763a0c9cdd1c49e1bb6496b410fb76188bc5c32122ef0beab0ea436c276c335e73a276c61d2f25e1bc4b864ab08e2d2985bf67651cebd99abc4d1a6956b025

From 9c7ef9445decf514ece2a652c1d5dd639fc4924e Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sun, 16 Aug 2026 15:57:47 -0500
Subject: [PATCH 32/32] 34.0.3 release RHBZ#2515297

---
 nextcloud.spec | 2 +-
 sources        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud.spec b/nextcloud.spec
index aca470b..2b4260b 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           nextcloud
-Version:        34.0.2
+Version:        34.0.3
 Release:        %autorelease
 Summary:        Private file sync and share server
 # Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
diff --git a/sources b/sources
index bcdec3c..95997de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nextcloud-34.0.2.tar.bz2) = fa763a0c9cdd1c49e1bb6496b410fb76188bc5c32122ef0beab0ea436c276c335e73a276c61d2f25e1bc4b864ab08e2d2985bf67651cebd99abc4d1a6956b025
+SHA512 (nextcloud-34.0.3.tar.bz2) = 3463dbbdeae5275a0791b115cf86aed41c5a138fdd19bb32ec12837a6698106b6f172e24fb1264a2d4e20b2b805bcf7841b2338e4e02f1fd5394fbed830cc695