From 8dd9f157af589c7d3f0a9a7cb31e15c928ee66ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 09:20:16 +0000 Subject: [PATCH 01/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 2e0c0e2..38fcd1d 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -26,7 +26,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.5.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -162,6 +162,9 @@ exit $ret %endif %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 4.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Oct 10 2022 Remi Collet - 4.5.1-1 - update to 4.5.1 From 962d2013d381ed6e726dac6ef48d95ab9a40ff44 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 25 Jan 2023 10:52:50 +0100 Subject: [PATCH 02/16] update to 4.5.3 low dependency on PHP 7.1 low dependency on sabre/xml v2 --- .gitignore | 1 + php-sabre-vobject4-autoload.php | 10 ------- php-sabre-vobject4.spec | 46 ++++++++++++++++++++++----------- sources | 2 +- 4 files changed, 33 insertions(+), 26 deletions(-) delete mode 100644 php-sabre-vobject4-autoload.php diff --git a/.gitignore b/.gitignore index 74b034d..79dcf62 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ clog /php-sabre-vobject4-4.4.3-2a043b9.tgz /php-sabre-vobject4-4.5.0-d1fdc0c.tgz /php-sabre-vobject4-4.5.1-1f83674.tgz +/php-sabre-vobject4-4.5.3-fe6d918.tgz diff --git a/php-sabre-vobject4-autoload.php b/php-sabre-vobject4-autoload.php deleted file mode 100644 index 57829aa..0000000 --- a/php-sabre-vobject4-autoload.php +++ /dev/null @@ -1,10 +0,0 @@ -= 7.1 BuildRequires: php-mbstring -BuildRequires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 3) +BuildRequires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 5) BuildRequires: php-date BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" -# "friendsofphp/php-cs-fixer": "~2.17.1", +# "friendsofphp/php-cs-fixer": "^2.17.1", # "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0", # "phpunit/php-invoker" : "^2.0 || ^3.1", # "phpstan/phpstan": "^0.12" BuildRequires: phpunit9 %global phpunit %{_bindir}/phpunit9 -# Autoloader -BuildRequires: php-composer(fedora/autoloader) %endif +# Autoloader +BuildRequires: php-fedora-autoloader-devel # From composer.json, "require" # "php" : "^7.1 || ^8.0", # "ext-mbstring" : "*", -# "sabre/xml" : "^2.1" +# "sabre/xml" : "^2.1 || ^3.0 || ^4.0" Requires: php(language) >= 7.1 Requires: php-mbstring # -Requires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 3) +Requires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 5) # From phpcompatinfo report for version 4.1.2 %if %{with_cmd} Requires: php-cli @@ -97,7 +96,19 @@ Autoloader: %{_datadir}/php/Sabre/VObject4/autoload.php %patch0 -p1 -b .rpm -cp %{SOURCE1} lib/autoload.php +phpab -t fedora -o lib/autoload.php lib + +cat << 'EOF' | tee -a lib/autoload.php + +// Dependencies +\Fedora\Autoloader\Dependencies::required([ + [ + '%{_datadir}/php/Sabre/Xml4/autoload.php', + '%{_datadir}/php/Sabre/Xml3/autoload.php', + '%{_datadir}/php/Sabre/Xml2/autoload.php', + ], +]); +EOF %build @@ -139,7 +150,7 @@ fi : Run upstream test suite against installed library ret=0 -for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do +for cmdarg in "php %{phpunit}" php80 php81 php82; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 @@ -162,6 +173,11 @@ exit $ret %endif %changelog +* Wed Jan 25 2023 Remi Collet - 4.5.3-1 +- update to 4.5.3 +- low dependency on PHP 7.1 +- low dependency on sabre/xml v2 + * Fri Jan 20 2023 Fedora Release Engineering - 4.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index b512811..aa51a9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.5.1-1f83674.tgz) = 2d6df21a8ef43b155f139105b662cb4ae84374110aa4187324fd775b5d71cd05fc467efe1a95dadd07b755585cf2c1bd63095a22e8747548c021be7dad1adcd2 +SHA512 (php-sabre-vobject4-4.5.3-fe6d918.tgz) = 4aab893c740ae1a0b770ded667f95b06d02bf172bb4cfb82bb18e7dd604620e8009d3fe9c4b555fa228b72f002bfedf3a82dd9533c4093cef8b94e8ab2713c7a From 9f5948b5ac5682a5ba40f527e43091006432f9a7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 25 Jan 2023 10:52:50 +0100 Subject: [PATCH 03/16] update to 4.5.3 low dependency on PHP 7.1 low dependency on sabre/xml v2 (cherry picked from commit 962d2013d381ed6e726dac6ef48d95ab9a40ff44) --- .gitignore | 1 + php-sabre-vobject4-autoload.php | 10 -------- php-sabre-vobject4.spec | 44 ++++++++++++++++++++++----------- sources | 2 +- 4 files changed, 32 insertions(+), 25 deletions(-) delete mode 100644 php-sabre-vobject4-autoload.php diff --git a/.gitignore b/.gitignore index 74b034d..79dcf62 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ clog /php-sabre-vobject4-4.4.3-2a043b9.tgz /php-sabre-vobject4-4.5.0-d1fdc0c.tgz /php-sabre-vobject4-4.5.1-1f83674.tgz +/php-sabre-vobject4-4.5.3-fe6d918.tgz diff --git a/php-sabre-vobject4-autoload.php b/php-sabre-vobject4-autoload.php deleted file mode 100644 index 57829aa..0000000 --- a/php-sabre-vobject4-autoload.php +++ /dev/null @@ -1,10 +0,0 @@ -= 7.1 BuildRequires: php-mbstring -BuildRequires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 3) +BuildRequires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 5) BuildRequires: php-date BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" -# "friendsofphp/php-cs-fixer": "~2.17.1", +# "friendsofphp/php-cs-fixer": "^2.17.1", # "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0", # "phpunit/php-invoker" : "^2.0 || ^3.1", # "phpstan/phpstan": "^0.12" BuildRequires: phpunit9 %global phpunit %{_bindir}/phpunit9 -# Autoloader -BuildRequires: php-composer(fedora/autoloader) %endif +# Autoloader +BuildRequires: php-fedora-autoloader-devel # From composer.json, "require" # "php" : "^7.1 || ^8.0", # "ext-mbstring" : "*", -# "sabre/xml" : "^2.1" +# "sabre/xml" : "^2.1 || ^3.0 || ^4.0" Requires: php(language) >= 7.1 Requires: php-mbstring # -Requires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 3) +Requires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 5) # From phpcompatinfo report for version 4.1.2 %if %{with_cmd} Requires: php-cli @@ -97,7 +96,19 @@ Autoloader: %{_datadir}/php/Sabre/VObject4/autoload.php %patch0 -p1 -b .rpm -cp %{SOURCE1} lib/autoload.php +phpab -t fedora -o lib/autoload.php lib + +cat << 'EOF' | tee -a lib/autoload.php + +// Dependencies +\Fedora\Autoloader\Dependencies::required([ + [ + '%{_datadir}/php/Sabre/Xml4/autoload.php', + '%{_datadir}/php/Sabre/Xml3/autoload.php', + '%{_datadir}/php/Sabre/Xml2/autoload.php', + ], +]); +EOF %build @@ -139,7 +150,7 @@ fi : Run upstream test suite against installed library ret=0 -for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do +for cmdarg in "php %{phpunit}" php80 php81 php82; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 @@ -162,6 +173,11 @@ exit $ret %endif %changelog +* Wed Jan 25 2023 Remi Collet - 4.5.3-1 +- update to 4.5.3 +- low dependency on PHP 7.1 +- low dependency on sabre/xml v2 + * Mon Oct 10 2022 Remi Collet - 4.5.1-1 - update to 4.5.1 diff --git a/sources b/sources index b512811..aa51a9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.5.1-1f83674.tgz) = 2d6df21a8ef43b155f139105b662cb4ae84374110aa4187324fd775b5d71cd05fc467efe1a95dadd07b755585cf2c1bd63095a22e8747548c021be7dad1adcd2 +SHA512 (php-sabre-vobject4-4.5.3-fe6d918.tgz) = 4aab893c740ae1a0b770ded667f95b06d02bf172bb4cfb82bb18e7dd604620e8009d3fe9c4b555fa228b72f002bfedf3a82dd9533c4093cef8b94e8ab2713c7a From 01fad9df0c06ecb229a0a3eeb88db04f1c22438b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 25 Jan 2023 10:56:04 +0100 Subject: [PATCH 04/16] fix changelog --- php-sabre-vobject4.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 58d3ab6..621455f 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -175,8 +175,8 @@ exit $ret %changelog * Wed Jan 25 2023 Remi Collet - 4.5.3-1 - update to 4.5.3 -- low dependency on PHP 7.1 -- low dependency on sabre/xml v2 +- allow sabre/xml v3 or v4 +- switch to classmap autoloader * Fri Jan 20 2023 Fedora Release Engineering - 4.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 17700db2463e19117b42411e59343e7dc17d523f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 25 Jan 2023 10:56:04 +0100 Subject: [PATCH 05/16] fix changelog (cherry picked from commit 01fad9df0c06ecb229a0a3eeb88db04f1c22438b) --- php-sabre-vobject4.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 40d49e7..26b0296 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -175,8 +175,8 @@ exit $ret %changelog * Wed Jan 25 2023 Remi Collet - 4.5.3-1 - update to 4.5.3 -- low dependency on PHP 7.1 -- low dependency on sabre/xml v2 +- allow sabre/xml v3 or v4 +- switch to classmap autoloader * Mon Oct 10 2022 Remi Collet - 4.5.1-1 - update to 4.5.1 From 02298d814b5b160cbd905d636b7b0dd371c8426c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 05:08:30 +0000 Subject: [PATCH 06/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 621455f..ef7ce3d 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -26,7 +26,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.5.3 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -173,6 +173,9 @@ exit $ret %endif %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 4.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 25 2023 Remi Collet - 4.5.3-1 - update to 4.5.3 - allow sabre/xml v3 or v4 From 04447806313f086b6bd7d08dd7448adc034f0485 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Nov 2023 15:36:07 +0100 Subject: [PATCH 07/16] v4.5.4 --- .gitignore | 1 + php-sabre-vobject4.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 79dcf62..17ca1e1 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ clog /php-sabre-vobject4-4.5.0-d1fdc0c.tgz /php-sabre-vobject4-4.5.1-1f83674.tgz /php-sabre-vobject4-4.5.3-fe6d918.tgz +/php-sabre-vobject4-4.5.4-a6d53a3.tgz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index ef7ce3d..0449197 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit fe6d9183154ed6f2f913f2b568d3d51d8ae9b308 +%global gh_commit a6d53a3e5bec85ed3dd78868b7de0f5b4e12f772 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -25,8 +25,8 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.5.3 -Release: 2%{?dist} +Version: 4.5.4 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -94,7 +94,7 @@ Autoloader: %{_datadir}/php/Sabre/VObject4/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -b .rpm +%patch -P0 -p1 -b .rpm phpab -t fedora -o lib/autoload.php lib @@ -150,7 +150,7 @@ fi : Run upstream test suite against installed library ret=0 -for cmdarg in "php %{phpunit}" php80 php81 php82; do +for cmdarg in "php %{phpunit}" php80 php81 php82 php83; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 @@ -173,6 +173,9 @@ exit $ret %endif %changelog +* Thu Nov 9 2023 Remi Collet - 4.5.4-1 +- update to 4.5.4 + * Fri Jul 21 2023 Fedora Release Engineering - 4.5.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index aa51a9c..5533a97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.5.3-fe6d918.tgz) = 4aab893c740ae1a0b770ded667f95b06d02bf172bb4cfb82bb18e7dd604620e8009d3fe9c4b555fa228b72f002bfedf3a82dd9533c4093cef8b94e8ab2713c7a +SHA512 (php-sabre-vobject4-4.5.4-a6d53a3.tgz) = f391d81868c842942ba0902345ea57a5767b769b6976683d884b15c1affe539ef60ca9a7c598a0a6be85a7386c12bfb83f1ad55a06788ddb3812aef24edff7ad From 8f6123cf0b3a32eb2b5d44e1e03988718ec5e961 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 21:23:39 +0000 Subject: [PATCH 08/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 0449197..1c2a492 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -26,7 +26,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.5.4 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -173,6 +173,9 @@ exit $ret %endif %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 4.5.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Nov 9 2023 Remi Collet - 4.5.4-1 - update to 4.5.4 From f2171dd000f8c63c4523a40ef9269ab0ebb75230 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 23:11:23 +0000 Subject: [PATCH 09/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 1c2a492..f3b7f24 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -26,7 +26,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.5.4 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -173,6 +173,9 @@ exit $ret %endif %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 4.5.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 4.5.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 39f7ebf1d29ea5b1c2aa3c190ff37ee3f6c65362 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 3 Jul 2024 06:51:03 +0200 Subject: [PATCH 10/16] v4.5.5 --- .gitignore | 1 + php-sabre-vobject4.spec | 20 +++++++++----------- sources | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 17ca1e1..f33e41c 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ clog /php-sabre-vobject4-4.5.1-1f83674.tgz /php-sabre-vobject4-4.5.3-fe6d918.tgz /php-sabre-vobject4-4.5.4-a6d53a3.tgz +/php-sabre-vobject4-4.5.5-7148cf5.tgz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index f3b7f24..6b8e2fd 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-sabre-vobject4 # -# Copyright (c) 2013-2023 Remi Collet +# Copyright (c) 2013-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -12,21 +12,16 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit a6d53a3e5bec85ed3dd78868b7de0f5b4e12f772 +%global gh_commit 7148cf57d25aaba0a49f6656d37c35e8175b3087 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject - -%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 -%global with_cmd 1 -%else -%global with_cmd 0 -%endif +%global with_cmd 1 Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.5.4 -Release: 3%{?dist} +Version: 4.5.5 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -150,7 +145,7 @@ fi : Run upstream test suite against installed library ret=0 -for cmdarg in "php %{phpunit}" php80 php81 php82 php83; do +for cmdarg in "php %{phpunit}" php81 php82 php83; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 @@ -173,6 +168,9 @@ exit $ret %endif %changelog +* Wed Jul 3 2024 Remi Collet - 4.5.5-1 +- update to 4.5.5 + * Thu Jan 25 2024 Fedora Release Engineering - 4.5.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 5533a97..033c186 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.5.4-a6d53a3.tgz) = f391d81868c842942ba0902345ea57a5767b769b6976683d884b15c1affe539ef60ca9a7c598a0a6be85a7386c12bfb83f1ad55a06788ddb3812aef24edff7ad +SHA512 (php-sabre-vobject4-4.5.5-7148cf5.tgz) = 6de05e4e85c5e44564b7b9f4d62a86cf478845a9f68be3a1d7373ebedaac7cf4df0995b2d373b5cde5a429fce708def7578fc209e44cc5a19c99812746c54609 From f9c9a18bc56c8574ac67c9600b4574d0d5c2a4c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 07:25:28 +0000 Subject: [PATCH 11/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 6b8e2fd..bdf3fbb 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -21,7 +21,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.5.5 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -168,6 +168,9 @@ exit $ret %endif %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 4.5.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jul 3 2024 Remi Collet - 4.5.5-1 - update to 4.5.5 From 2e6b0cacd00f408918d428d92666dddd92c73550 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Oct 2024 07:35:18 +0200 Subject: [PATCH 12/16] v4.5.6 --- .gitignore | 1 + php-sabre-vobject4.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index f33e41c..60fcf74 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ clog /php-sabre-vobject4-4.5.3-fe6d918.tgz /php-sabre-vobject4-4.5.4-a6d53a3.tgz /php-sabre-vobject4-4.5.5-7148cf5.tgz +/php-sabre-vobject4-4.5.6-900266b.tgz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index bdf3fbb..338f40d 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 7148cf57d25aaba0a49f6656d37c35e8175b3087 +%global gh_commit 900266bb3bd448a9f7f41f82344ad0aba237cb27 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -20,8 +20,8 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.5.5 -Release: 2%{?dist} +Version: 4.5.6 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -43,10 +43,10 @@ BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" # "friendsofphp/php-cs-fixer": "^2.17.1", -# "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0", +# "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.6", # "phpunit/php-invoker" : "^2.0 || ^3.1", -# "phpstan/phpstan": "^0.12" -BuildRequires: phpunit9 +# "phpstan/phpstan": "^0.12 || ^1.11" +BuildRequires: phpunit9 >= 9.6 %global phpunit %{_bindir}/phpunit9 %endif # Autoloader @@ -145,7 +145,7 @@ fi : Run upstream test suite against installed library ret=0 -for cmdarg in "php %{phpunit}" php81 php82 php83; do +for cmdarg in "php %{phpunit}" php81 php82 php83 php84; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 @@ -168,6 +168,9 @@ exit $ret %endif %changelog +* Tue Oct 15 2024 Remi Collet - 4.5.6-1 +- update to 4.5.6 + * Fri Jul 19 2024 Fedora Release Engineering - 4.5.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 033c186..341f73c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.5.5-7148cf5.tgz) = 6de05e4e85c5e44564b7b9f4d62a86cf478845a9f68be3a1d7373ebedaac7cf4df0995b2d373b5cde5a429fce708def7578fc209e44cc5a19c99812746c54609 +SHA512 (php-sabre-vobject4-4.5.6-900266b.tgz) = 5ee1c4cd29e4b5acdcfe62ca46a3a013abbfcab86a571259205c4d373f3d5fa1499ac9af521cf5c0c73a424ad4a93a9b18826aa7e157062ccac542c06f05f425 From 2537d91637ecb743f2c259bc112176c8609587cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:40:45 +0000 Subject: [PATCH 13/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 338f40d..1d20261 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -21,7 +21,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.5.6 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -168,6 +168,9 @@ exit $ret %endif %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 4.5.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Oct 15 2024 Remi Collet - 4.5.6-1 - update to 4.5.6 From 0a6a83ab200a2e07053d8ffdb52d19b05817662e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 22 Apr 2025 11:45:05 +0200 Subject: [PATCH 14/16] update to 4.5.7 re-license spec file to CECILL-2.1 --- .gitignore | 1 + php-sabre-vobject4.spec | 20 +++++++++++--------- sources | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 60fcf74..9128a86 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ clog /php-sabre-vobject4-4.5.4-a6d53a3.tgz /php-sabre-vobject4-4.5.5-7148cf5.tgz /php-sabre-vobject4-4.5.6-900266b.tgz +/php-sabre-vobject4-4.5.7-ff22611.tgz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 1d20261..fc9e436 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -1,18 +1,16 @@ # remirepo/fedora spec file for php-sabre-vobject4 # -# Copyright (c) 2013-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2013-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # %bcond_without tests -# For compatibility with SCL -%undefine __brp_mangle_shebangs -%global gh_commit 900266bb3bd448a9f7f41f82344ad0aba237cb27 +%global gh_commit ff22611a53782e90c97be0d0bc4a5f98a5c0a12c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -20,8 +18,8 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.5.6 -Release: 2%{?dist} +Version: 4.5.7 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -45,7 +43,7 @@ BuildRequires: php-xml # "friendsofphp/php-cs-fixer": "^2.17.1", # "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.6", # "phpunit/php-invoker" : "^2.0 || ^3.1", -# "phpstan/phpstan": "^0.12 || ^1.11" +# "phpstan/phpstan": "^0.12 || ^1.12 || ^2.0" BuildRequires: phpunit9 >= 9.6 %global phpunit %{_bindir}/phpunit9 %endif @@ -168,6 +166,10 @@ exit $ret %endif %changelog +* Fri Apr 18 2025 Remi Collet - 4.5.7-1 +- update to 4.5.7 +- re-license spec file to CECILL-2.1 + * Sat Jan 18 2025 Fedora Release Engineering - 4.5.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 341f73c..03dac77 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.5.6-900266b.tgz) = 5ee1c4cd29e4b5acdcfe62ca46a3a013abbfcab86a571259205c4d373f3d5fa1499ac9af521cf5c0c73a424ad4a93a9b18826aa7e157062ccac542c06f05f425 +SHA512 (php-sabre-vobject4-4.5.7-ff22611.tgz) = d3b74a6cc3afc5ffd44e74d7c8b0b970536743867730c7eed55f4903b277417762fc195ff05f1c13cfd2f4c9a27dea3849980b95c1ecfc14f8d39475357f5532 From ca7b42d32bc1789ec5b9c3a92db9c00838bc2614 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:30:42 +0000 Subject: [PATCH 15/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index fc9e436..6bb4c8c 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -19,7 +19,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.5.7 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -166,6 +166,9 @@ exit $ret %endif %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 4.5.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Apr 18 2025 Remi Collet - 4.5.7-1 - update to 4.5.7 - re-license spec file to CECILL-2.1 From 716ccffe851a22bcb95847a4006781f994e0cd4a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Jan 2026 14:57:14 +0100 Subject: [PATCH 16/16] v4.5.8 --- .gitignore | 1 + php-sabre-vobject4.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 9128a86..7dc7872 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ clog /php-sabre-vobject4-4.5.5-7148cf5.tgz /php-sabre-vobject4-4.5.6-900266b.tgz /php-sabre-vobject4-4.5.7-ff22611.tgz +/php-sabre-vobject4-4.5.8-d554eb2.tgz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 6bb4c8c..70d73ee 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-sabre-vobject4 # -# SPDX-FileCopyrightText: Copyright 2013-2025 Remi Collet +# SPDX-FileCopyrightText: Copyright 2013-2026 Remi Collet # SPDX-License-Identifier: CECILL-2.1 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # @@ -10,7 +10,7 @@ %bcond_without tests -%global gh_commit ff22611a53782e90c97be0d0bc4a5f98a5c0a12c +%global gh_commit d554eb24d64232922e1eab5896cc2f84b3b9ffb1 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -18,8 +18,8 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.5.7 -Release: 2%{?dist} +Version: 4.5.8 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -143,7 +143,7 @@ fi : Run upstream test suite against installed library ret=0 -for cmdarg in "php %{phpunit}" php81 php82 php83 php84; do +for cmdarg in "php %{phpunit}" php82 php83 php84; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 @@ -166,6 +166,9 @@ exit $ret %endif %changelog +* Mon Jan 12 2026 Remi Collet - 4.5.8-1 +- update to 4.5.8 + * Fri Jul 25 2025 Fedora Release Engineering - 4.5.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 03dac77..83fc031 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.5.7-ff22611.tgz) = d3b74a6cc3afc5ffd44e74d7c8b0b970536743867730c7eed55f4903b277417762fc195ff05f1c13cfd2f4c9a27dea3849980b95c1ecfc14f8d39475357f5532 +SHA512 (php-sabre-vobject4-4.5.8-d554eb2.tgz) = 8e6af0c7069430561b3764e7bf1b4a87979732749f8628a014f34a728c426bcdd3548e56fe398e0c18ae0140a692f9c839ef1d7482e1e06c599fa813c27429d5