From ebcb947409e9d95ddbcda305ba17eb7b43e9c476 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 10:08:00 +0000 Subject: [PATCH 01/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-uri2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index 871e6f6..8374da8 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -23,7 +23,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs Version: 2.1.2 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD @@ -122,6 +122,9 @@ exit $ret %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 2.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Jul 5 2019 Remi Collet - 2.1.2-2 - fix autoloader From 71d0d8a0bdac31e7139521d9094c6098295f77eb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 10 Sep 2019 10:46:40 +0200 Subject: [PATCH 02/24] v2.1.3 --- .gitignore | 1 + php-sabre-uri2.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7d3b549..53c2293 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /php-sabre-uri2-2.1.2-c260a55.tgz +/php-sabre-uri2-2.1.3-18f4543.tgz diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index 8374da8..3c25162 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # Github -%global gh_commit c260a55cbd2083c03484f56f72fe042fee0c17ed +%global gh_commit 18f454324f371cbcabdad3d0d3755b4b0182095d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project uri @@ -22,8 +22,8 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs -Version: 2.1.2 -Release: 3%{?dist} +Version: 2.1.3 +Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD @@ -122,6 +122,9 @@ exit $ret %changelog +* Tue Sep 10 2019 Remi Collet - 2.1.3-1 +- update to 2.1.3 + * Fri Jul 26 2019 Fedora Release Engineering - 2.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 79e5c87..8522760 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-uri2-2.1.2-c260a55.tgz) = 8c0382af89d87da1ca22f02d6fc71b9d5d106109645345bfac9b7f41193d9822ec0c18c11b8d827d89cbb285376fdb9c082ce5c6b6538773b6121d4e65529373 +SHA512 (php-sabre-uri2-2.1.3-18f4543.tgz) = 59ff60bc4771d9b369231aa52954f0b1cf868c11c74b52d8bf01eda7e3d0b435671e94c8b5990857d6977bd30b99f313400bfd78c466dbde19e9aee72501082d From 21015b7867973f8eebae08963ca713e30c1946c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 08:40:54 +0000 Subject: [PATCH 03/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-uri2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index 3c25162..63ce0b5 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -23,7 +23,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs Version: 2.1.3 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD @@ -122,6 +122,9 @@ exit $ret %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 2.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Sep 10 2019 Remi Collet - 2.1.3-1 - update to 2.1.3 From 62b5999199c8f5e5a139da5419e945c9729b7a14 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 3 Feb 2020 08:17:49 +0100 Subject: [PATCH 04/24] update to 2.2.0 raise dependency on PHP 7.1 switch to phpunit8 --- .gitignore | 1 + php-sabre-uri2.spec | 28 +++++++++++++++++----------- sources | 2 +- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 53c2293..d923072 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /php-sabre-uri2-2.1.2-c260a55.tgz /php-sabre-uri2-2.1.3-18f4543.tgz +/php-sabre-uri2-2.2.0-059d110.tgz diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index 63ce0b5..f340cba 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-sabre-uri2 # -# Copyright (c) 2016-2019 Remi Collet +# Copyright (c) 2016-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # # Github -%global gh_commit 18f454324f371cbcabdad3d0d3755b4b0182095d +%global gh_commit 059d11012603be2e32ddb7543602965563ddbb09 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project uri @@ -22,8 +22,8 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs -Version: 2.1.3 -Release: 2%{?dist} +Version: 2.2.0 +Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD @@ -33,18 +33,19 @@ Source1: makesrc.sh BuildArch: noarch %if %{with_tests} -BuildRequires: php(language) >= 7 +BuildRequires: php(language) >= 7.1 # From composer.json, "require-dev": { -# "phpunit/phpunit" : "^6" +# "friendsofphp/php-cs-fixer": "~2.16.1", +# "phpunit/phpunit" : "^7 || ^8" BuildRequires: php-pcre -BuildRequires: phpunit6 +BuildRequires: phpunit8 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer.json, "require" : { -# "php": ">=7" -Requires: php(language) > 7 +# "php": "^7.1" +Requires: php(language) > 7.1 # From phpcompatinfo report for version 2.1.2 Requires: php-pcre # Autoloader @@ -101,10 +102,10 @@ mkdir vendor ln -s %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php vendor/autoload.php cd tests -for cmd in php php71 php72 php73 php74 +for cmd in php php72 php73 php74 do if which $cmd; then - $cmd %{_bindir}/phpunit6 --verbose || ret=1 + $cmd %{_bindir}/phpunit8 --verbose || ret=1 fi done exit $ret @@ -122,6 +123,11 @@ exit $ret %changelog +* Sat Feb 1 2020 Remi Collet - 2.2.0-1 +- update to 2.2.0 +- raise dependency on PHP 7.1 +- switch to phpunit8 + * Thu Jan 30 2020 Fedora Release Engineering - 2.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 8522760..6c209c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-uri2-2.1.3-18f4543.tgz) = 59ff60bc4771d9b369231aa52954f0b1cf868c11c74b52d8bf01eda7e3d0b435671e94c8b5990857d6977bd30b99f313400bfd78c466dbde19e9aee72501082d +SHA512 (php-sabre-uri2-2.2.0-059d110.tgz) = 11f5d5fc453e48b0edad040746326695e4f0253b819f3280b05d76f0be1aecddf392234e6dda6fb3910e01ee03937f4ce42e48ac82d415c3d42ff894adceb1e6 From c7deae69d8945315d1d388c65d5fdb17b6bb354f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 22:10:05 +0000 Subject: [PATCH 05/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-uri2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index f340cba..1079bc9 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -23,7 +23,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs Version: 2.2.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD @@ -123,6 +123,9 @@ exit $ret %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Feb 1 2020 Remi Collet - 2.2.0-1 - update to 2.2.0 - raise dependency on PHP 7.1 From ca5b4ee939e555fc4770d855801d2c86dcf62318 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Oct 2020 09:56:35 +0200 Subject: [PATCH 06/24] update to 2.2.1 switch to phpunit9 --- .gitignore | 1 + php-sabre-uri2.spec | 38 ++++++++++++++++++++++++++------------ sources | 2 +- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index d923072..ecb4b83 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /php-sabre-uri2-2.1.2-c260a55.tgz /php-sabre-uri2-2.1.3-18f4543.tgz /php-sabre-uri2-2.2.0-059d110.tgz +/php-sabre-uri2-2.2.1-f502edf.tgz diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index 1079bc9..26f1406 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -6,8 +6,11 @@ # # Please, preserve the changelog entries # + +%bcond_without tests + # Github -%global gh_commit 059d11012603be2e32ddb7543602965563ddbb09 +%global gh_commit f502edffafea8d746825bd5f0b923a60fd2715ff %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project uri @@ -18,12 +21,11 @@ %global ns_vendor Sabre %global ns_project Uri %global major 2 -%global with_tests 0%{!?_without_tests:1} Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs -Version: 2.2.0 -Release: 2%{?dist} +Version: 2.2.1 +Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD @@ -32,19 +34,26 @@ Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -%if %{with_tests} +%if %{with tests} BuildRequires: php(language) >= 7.1 # From composer.json, "require-dev": { # "friendsofphp/php-cs-fixer": "~2.16.1", -# "phpunit/phpunit" : "^7 || ^8" +# "phpstan/phpstan": "^0.12", +# "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0" BuildRequires: php-pcre -BuildRequires: phpunit8 +%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 +BuildRequires: phpunit9 +%global phpunit %{_bindir}/phpunit9 +%else +BuildRequires: phpunit8 >= 8.5 +%global phpunit %{_bindir}/phpunit8 +%endif %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer.json, "require" : { -# "php": "^7.1" +# "php": "^7.1 || ^8.0" Requires: php(language) > 7.1 # From phpcompatinfo report for version 2.1.2 Requires: php-pcre @@ -96,16 +105,17 @@ cp -pr lib %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major} %check -%if %{with_tests} +%if %{with tests} : Run upstream test suite against installed library mkdir vendor ln -s %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php vendor/autoload.php cd tests -for cmd in php php72 php73 php74 +for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80 do - if which $cmd; then - $cmd %{_bindir}/phpunit8 --verbose || ret=1 + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1 fi done exit $ret @@ -123,6 +133,10 @@ exit $ret %changelog +* Mon Oct 5 2020 Remi Collet - 2.2.1-1 +- update to 2.2.1 +- switch to phpunit9 + * Tue Jul 28 2020 Fedora Release Engineering - 2.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 6c209c5..f202c1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-uri2-2.2.0-059d110.tgz) = 11f5d5fc453e48b0edad040746326695e4f0253b819f3280b05d76f0be1aecddf392234e6dda6fb3910e01ee03937f4ce42e48ac82d415c3d42ff894adceb1e6 +SHA512 (php-sabre-uri2-2.2.1-f502edf.tgz) = 51fe6e32bbe81d7dccbb52a0d5d8374a7c6005034353494004baa1e3394838906174d1ddae46485b6e433bccd5d7021ac4abc2b6ccef50af0a4ff390c22840cd From 5f7c51f3b4bb5fc35eb8978a79632992e038b167 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 07:46:38 +0000 Subject: [PATCH 07/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-uri2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index 26f1406..e30f8ff 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs Version: 2.2.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD @@ -133,6 +133,9 @@ exit $ret %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Oct 5 2020 Remi Collet - 2.2.1-1 - update to 2.2.1 - switch to phpunit9 From 1e8f5f01a3fe6b42f596d01bab7b4fe6ee83b82f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 03:12:21 +0000 Subject: [PATCH 08/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-uri2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index e30f8ff..d16240a 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs Version: 2.2.1 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD @@ -133,6 +133,9 @@ exit $ret %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 2.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From ef7d3edba9531d5ff05b263470c53da7bbc0e516 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 4 Nov 2021 12:36:32 +0100 Subject: [PATCH 09/24] v2.2.2 --- .gitignore | 1 + php-sabre-uri2.spec | 28 ++++++++++++++++------------ sources | 2 +- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index ecb4b83..202271a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /php-sabre-uri2-2.1.3-18f4543.tgz /php-sabre-uri2-2.2.0-059d110.tgz /php-sabre-uri2-2.2.1-f502edf.tgz +/php-sabre-uri2-2.2.2-7cb0f48.tgz diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index d16240a..4bb0529 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-sabre-uri2 # -# Copyright (c) 2016-2020 Remi Collet +# Copyright (c) 2016-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit f502edffafea8d746825bd5f0b923a60fd2715ff +%global gh_commit 7cb0f489578afad5006e85cd60f18ff33f2d440d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project uri @@ -24,8 +24,8 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs -Version: 2.2.1 -Release: 3%{?dist} +Version: 2.2.2 +Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD @@ -37,17 +37,12 @@ BuildArch: noarch %if %{with tests} BuildRequires: php(language) >= 7.1 # From composer.json, "require-dev": { -# "friendsofphp/php-cs-fixer": "~2.16.1", +# "friendsofphp/php-cs-fixer": "~2.17.1", # "phpstan/phpstan": "^0.12", # "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0" BuildRequires: php-pcre -%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 BuildRequires: phpunit9 %global phpunit %{_bindir}/phpunit9 -%else -BuildRequires: phpunit8 >= 8.5 -%global phpunit %{_bindir}/phpunit8 -%endif %endif # Autoloader BuildRequires: php-fedora-autoloader-devel @@ -105,14 +100,20 @@ cp -pr lib %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major} %check +: Check version +php -r ' +require "%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php"; +echo Sabre\Uri\Version::VERSION . "\n"; +exit (Sabre\Uri\Version::VERSION === "%{version}" ? 0 : 1); +' + %if %{with tests} : Run upstream test suite against installed library mkdir vendor ln -s %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php vendor/autoload.php cd tests -for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80 -do +for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1 @@ -133,6 +134,9 @@ exit $ret %changelog +* Thu Nov 4 2021 Remi Collet - 2.2.2-1 +- update to 2.2.2 + * Fri Jul 23 2021 Fedora Release Engineering - 2.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index f202c1f..b9108c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-uri2-2.2.1-f502edf.tgz) = 51fe6e32bbe81d7dccbb52a0d5d8374a7c6005034353494004baa1e3394838906174d1ddae46485b6e433bccd5d7021ac4abc2b6ccef50af0a4ff390c22840cd +SHA512 (php-sabre-uri2-2.2.2-7cb0f48.tgz) = 59b583f066beea0e06ea83f2d7228470bb931e1728f0fad1e3121713a54092c5e3432c09e8030084d02e0254ca6bfed93322d7d7b5c955a867cd05e9100f0fc4 From f9363e23e9fe7c7bad6137a97cfaa8fe85d80e77 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 08:31:43 +0000 Subject: [PATCH 10/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-uri2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index 4bb0529..3ed2de5 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs Version: 2.2.2 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD @@ -134,6 +134,9 @@ exit $ret %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 2.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Nov 4 2021 Remi Collet - 2.2.2-1 - update to 2.2.2 From 35758a23269380c011a98949d76260290e5d6ea0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 14:25:27 +0000 Subject: [PATCH 11/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-uri2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index 3ed2de5..9afb453 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs Version: 2.2.2 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD @@ -134,6 +134,9 @@ exit $ret %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 2.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jan 21 2022 Fedora Release Engineering - 2.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 348ec017395d362c1dcb2f2d4b02eb43e61fbf9c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 18 Aug 2022 07:44:04 +0200 Subject: [PATCH 12/24] v2.3.0 --- .gitignore | 1 + php-sabre-uri2.spec | 23 +++++++++++++---------- sources | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 202271a..48b283f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /php-sabre-uri2-2.2.0-059d110.tgz /php-sabre-uri2-2.2.1-f502edf.tgz /php-sabre-uri2-2.2.2-7cb0f48.tgz +/php-sabre-uri2-2.3.0-4e84208.tgz diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index 9afb453..713500a 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 7cb0f489578afad5006e85cd60f18ff33f2d440d +%global gh_commit 4e84208b86d351e8a439613f318feda7a0152b48 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project uri @@ -24,8 +24,8 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs -Version: 2.2.2 -Release: 3%{?dist} +Version: 2.3.0 +Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD @@ -35,11 +35,11 @@ Source1: makesrc.sh BuildArch: noarch %if %{with tests} -BuildRequires: php(language) >= 7.1 +BuildRequires: php(language) >= 7.4 # From composer.json, "require-dev": { -# "friendsofphp/php-cs-fixer": "~2.17.1", -# "phpstan/phpstan": "^0.12", -# "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0" +# "friendsofphp/php-cs-fixer": "^3.9", +# "phpstan/phpstan": "^1.8", +# "phpunit/phpunit" : "^9.0" BuildRequires: php-pcre BuildRequires: phpunit9 %global phpunit %{_bindir}/phpunit9 @@ -48,8 +48,8 @@ BuildRequires: phpunit9 BuildRequires: php-fedora-autoloader-devel # From composer.json, "require" : { -# "php": "^7.1 || ^8.0" -Requires: php(language) > 7.1 +# "php": "^7.4 || ^8.0" +Requires: php(language) > 7.4 # From phpcompatinfo report for version 2.1.2 Requires: php-pcre # Autoloader @@ -113,7 +113,7 @@ mkdir vendor ln -s %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php vendor/autoload.php cd tests -for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do +for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1 @@ -134,6 +134,9 @@ exit $ret %changelog +* Thu Aug 18 2022 Remi Collet - 2.3.0-1 +- update to 2.3.0 + * Fri Jul 22 2022 Fedora Release Engineering - 2.2.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index b9108c2..95337de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-uri2-2.2.2-7cb0f48.tgz) = 59b583f066beea0e06ea83f2d7228470bb931e1728f0fad1e3121713a54092c5e3432c09e8030084d02e0254ca6bfed93322d7d7b5c955a867cd05e9100f0fc4 +SHA512 (php-sabre-uri2-2.3.0-4e84208.tgz) = d7c5f3bcba334561a716e9a346559a29edfa932f1582a6a9d5b5b90baff5c1cecd0104a56e464ec880d42805bcce1e09f14889b0a6b3b0b4c7b4a59217267c9b From bae00fd6b6347260e543bd8f80b715c9ac0da9b3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Sep 2022 10:23:03 +0200 Subject: [PATCH 13/24] v2.3.1 --- .gitignore | 1 + php-sabre-uri2.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 48b283f..d5aa465 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /php-sabre-uri2-2.2.1-f502edf.tgz /php-sabre-uri2-2.2.2-7cb0f48.tgz /php-sabre-uri2-2.3.0-4e84208.tgz +/php-sabre-uri2-2.3.1-2ec3dce.tgz diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index 713500a..1d8a4bd 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-sabre-uri2 # -# Copyright (c) 2016-2021 Remi Collet +# Copyright (c) 2016-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 4e84208b86d351e8a439613f318feda7a0152b48 +%global gh_commit 2ec3dcec9e1586893c9820a12f573f73a71200f4 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project uri @@ -24,7 +24,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs -Version: 2.3.0 +Version: 2.3.1 Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} @@ -134,6 +134,9 @@ exit $ret %changelog +* Mon Sep 12 2022 Remi Collet - 2.3.1-1 +- update to 2.3.1 + * Thu Aug 18 2022 Remi Collet - 2.3.0-1 - update to 2.3.0 diff --git a/sources b/sources index 95337de..b81cc73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-uri2-2.3.0-4e84208.tgz) = d7c5f3bcba334561a716e9a346559a29edfa932f1582a6a9d5b5b90baff5c1cecd0104a56e464ec880d42805bcce1e09f14889b0a6b3b0b4c7b4a59217267c9b +SHA512 (php-sabre-uri2-2.3.1-2ec3dce.tgz) = d34deca22039ae3b1991db2c75f53d706706fe88e1274dca2a1ec6ad08bd9fda64120a03d919f2ffa402433a61ee856d14f6e420857e93c0f00abf217ec00cca From 6e1a39bea62b7b35d06af9e21c27bfa257efb272 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 19 Sep 2022 14:48:52 +0200 Subject: [PATCH 14/24] v2.3.2 --- .gitignore | 1 + php-sabre-uri2.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d5aa465..195d133 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /php-sabre-uri2-2.2.2-7cb0f48.tgz /php-sabre-uri2-2.3.0-4e84208.tgz /php-sabre-uri2-2.3.1-2ec3dce.tgz +/php-sabre-uri2-2.3.2-eceb4a1.tgz diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index 1d8a4bd..0327303 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 2ec3dcec9e1586893c9820a12f573f73a71200f4 +%global gh_commit eceb4a1b8b680b45e215574222d6ca00be541970 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project uri @@ -24,7 +24,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs -Version: 2.3.1 +Version: 2.3.2 Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} @@ -134,6 +134,9 @@ exit $ret %changelog +* Mon Sep 19 2022 Remi Collet - 2.3.2-1 +- update to 2.3.2 + * Mon Sep 12 2022 Remi Collet - 2.3.1-1 - update to 2.3.1 diff --git a/sources b/sources index b81cc73..7039793 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-uri2-2.3.1-2ec3dce.tgz) = d34deca22039ae3b1991db2c75f53d706706fe88e1274dca2a1ec6ad08bd9fda64120a03d919f2ffa402433a61ee856d14f6e420857e93c0f00abf217ec00cca +SHA512 (php-sabre-uri2-2.3.2-eceb4a1.tgz) = 9f041963ce4eaf2946c180234ed88581967ca4bbb62c94e66adf6069fa1a61e8d6311dd5800f6b1d74c021f90661e0e4885007e8a9f189211ab84b60f4b65ee6 From b05bd62051b278486abafe01f80a4484b70fcc2a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 09:20:07 +0000 Subject: [PATCH 15/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-uri2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index 0327303..e2251cf 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs Version: 2.3.2 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD @@ -134,6 +134,9 @@ exit $ret %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 2.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Sep 19 2022 Remi Collet - 2.3.2-1 - update to 2.3.2 From 369ada105d0a320d26850a511113fb8b567f69ca Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Jun 2023 08:03:02 +0200 Subject: [PATCH 16/24] v2.3.3 (cherry picked from commit 9a23239762fd773c452e8a647f74e83fc4162f5c) --- .gitignore | 1 + php-sabre-uri2.spec | 24 +++++++++++++++--------- sources | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 195d133..85a31e5 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /php-sabre-uri2-2.3.0-4e84208.tgz /php-sabre-uri2-2.3.1-2ec3dce.tgz /php-sabre-uri2-2.3.2-eceb4a1.tgz +/php-sabre-uri2-2.3.3-7e0e7df.tgz diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index e2251cf..d7970ac 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit eceb4a1b8b680b45e215574222d6ca00be541970 +%global gh_commit 7e0e7dfd0b7e14346a27eabd66e843a6e7f1812b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project uri @@ -24,11 +24,11 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs -Version: 2.3.2 -Release: 2%{?dist} +Version: 2.3.3 +Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} -License: BSD +License: BSD-3-Clause # Git snapshot with tests, because of .gitattributes Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh @@ -37,11 +37,14 @@ BuildArch: noarch %if %{with tests} BuildRequires: php(language) >= 7.4 # From composer.json, "require-dev": { -# "friendsofphp/php-cs-fixer": "^3.9", -# "phpstan/phpstan": "^1.8", -# "phpunit/phpunit" : "^9.0" +# "friendsofphp/php-cs-fixer": "^3.17", +# "phpstan/phpstan": "^1.10", +# "phpstan/phpstan-phpunit": "^1.3", +# "phpstan/phpstan-strict-rules": "^1.5", +# "phpstan/extension-installer": "^1.3", +# "phpunit/phpunit" : "^9.6" BuildRequires: php-pcre -BuildRequires: phpunit9 +BuildRequires: phpunit9 >= 9.6 %global phpunit %{_bindir}/phpunit9 %endif # Autoloader @@ -113,7 +116,7 @@ mkdir vendor ln -s %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php vendor/autoload.php cd tests -for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do +for cmdarg in "php %{phpunit}" php80 php81 php82 php83; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1 @@ -134,6 +137,9 @@ exit $ret %changelog +* Mon Jun 12 2023 Remi Collet - 2.3.3-1 +- update to 2.3.3 + * Fri Jan 20 2023 Fedora Release Engineering - 2.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 7039793..a317c78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-uri2-2.3.2-eceb4a1.tgz) = 9f041963ce4eaf2946c180234ed88581967ca4bbb62c94e66adf6069fa1a61e8d6311dd5800f6b1d74c021f90661e0e4885007e8a9f189211ab84b60f4b65ee6 +SHA512 (php-sabre-uri2-2.3.3-7e0e7df.tgz) = 105d4f8a59db75519587e549de72a6d1edf675e0050341e4cda2d1bb65b307c6667af666c0e4d718163abbd0b15c3bfad31fe734f37f6eed0f3885c84a001c26 From 79b86065cfc811a7cea503d20093c4481958f681 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 05:08:20 +0000 Subject: [PATCH 17/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-uri2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index d7970ac..83875ab 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs Version: 2.3.3 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD-3-Clause @@ -137,6 +137,9 @@ exit $ret %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 2.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jun 12 2023 Remi Collet - 2.3.3-1 - update to 2.3.3 From b8dd9c7fd52c66f02a33ce359bb4c4f6ed097663 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 21:23:30 +0000 Subject: [PATCH 18/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-sabre-uri2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index 83875ab..8b85871 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs Version: 2.3.3 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD-3-Clause @@ -137,6 +137,9 @@ exit $ret %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 2.3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 2.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 9125c8c50188d78036eb5c7c8694f63dcca2e688 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 23:11:14 +0000 Subject: [PATCH 19/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-sabre-uri2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index 8b85871..0481b48 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs Version: 2.3.3 -Release: 3%{?dist} +Release: 4%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD-3-Clause @@ -137,6 +137,9 @@ exit $ret %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 2.3.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 2.3.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ca2f03156361650584f057a321ffbebce0f5d818 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 29 Jan 2024 11:07:25 +0000 Subject: [PATCH 20/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-sabre-uri2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index 0481b48..83d464f 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs Version: 2.3.3 -Release: 4%{?dist} +Release: 5%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD-3-Clause @@ -137,6 +137,9 @@ exit $ret %changelog +* Mon Jan 29 2024 Fedora Release Engineering - 2.3.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 2.3.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 1247fbef448934b6447ace931ab3d26b5717fb05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 07:25:18 +0000 Subject: [PATCH 21/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-sabre-uri2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index 83d464f..4f07056 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs Version: 2.3.3 -Release: 5%{?dist} +Release: 6%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD-3-Clause @@ -137,6 +137,9 @@ exit $ret %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 2.3.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 29 2024 Fedora Release Engineering - 2.3.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0092be54fdecfce6e60e92b0304c7d4080e60c05 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 28 Aug 2024 11:03:28 +0200 Subject: [PATCH 22/24] update to 2.3.4 (no change, CS only) --- .gitignore | 1 + php-sabre-uri2.spec | 23 +++++++++++++---------- sources | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 85a31e5..d98e3a1 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /php-sabre-uri2-2.3.1-2ec3dce.tgz /php-sabre-uri2-2.3.2-eceb4a1.tgz /php-sabre-uri2-2.3.3-7e0e7df.tgz +/php-sabre-uri2-2.3.4-b76524c.tgz diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index 4f07056..1946dfd 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-sabre-uri2 # -# Copyright (c) 2016-2022 Remi Collet +# Copyright (c) 2016-2024 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 7e0e7dfd0b7e14346a27eabd66e843a6e7f1812b +%global gh_commit b76524c22de90d80ca73143680a8e77b1266c291 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project uri @@ -24,8 +24,8 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs -Version: 2.3.3 -Release: 6%{?dist} +Version: 2.3.4 +Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD-3-Clause @@ -37,11 +37,11 @@ BuildArch: noarch %if %{with tests} BuildRequires: php(language) >= 7.4 # From composer.json, "require-dev": { -# "friendsofphp/php-cs-fixer": "^3.17", -# "phpstan/phpstan": "^1.10", -# "phpstan/phpstan-phpunit": "^1.3", -# "phpstan/phpstan-strict-rules": "^1.5", -# "phpstan/extension-installer": "^1.3", +# "friendsofphp/php-cs-fixer": "^3.63", +# "phpstan/phpstan": "^1.12", +# "phpstan/phpstan-phpunit": "^1.4", +# "phpstan/phpstan-strict-rules": "^1.6", +# "phpstan/extension-installer": "^1.4", # "phpunit/phpunit" : "^9.6" BuildRequires: php-pcre BuildRequires: phpunit9 >= 9.6 @@ -116,7 +116,7 @@ mkdir vendor ln -s %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php vendor/autoload.php cd tests -for cmdarg in "php %{phpunit}" php80 php81 php82 php83; do +for cmdarg in "php %{phpunit}" php81 php82 php83 php84; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1 @@ -137,6 +137,9 @@ exit $ret %changelog +* Wed Aug 28 2024 Remi Collet - 2.3.4-1 +- update to 2.3.4 (no change, CS only) + * Fri Jul 19 2024 Fedora Release Engineering - 2.3.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index a317c78..7fc2f4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-uri2-2.3.3-7e0e7df.tgz) = 105d4f8a59db75519587e549de72a6d1edf675e0050341e4cda2d1bb65b307c6667af666c0e4d718163abbd0b15c3bfad31fe734f37f6eed0f3885c84a001c26 +SHA512 (php-sabre-uri2-2.3.4-b76524c.tgz) = 7662d3d32004e184bc26465ea42f171006492b32f28e09ac22ff0bc227a368d427fe7b1dd51bd9a011129fc641821827b8c2c8bc8c55673d0ba2c630df6b34fe From 9438cc47977957cc5d3d93c22111bb044b35054e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:40:33 +0000 Subject: [PATCH 23/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-sabre-uri2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index 1946dfd..8551857 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs Version: 2.3.4 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD-3-Clause @@ -137,6 +137,9 @@ exit $ret %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 2.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Aug 28 2024 Remi Collet - 2.3.4-1 - update to 2.3.4 (no change, CS only) From 24be543b013fe9032277ed0ecfbd531d0df5dc1a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:30:36 +0000 Subject: [PATCH 24/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-sabre-uri2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index 8551857..a8eb33d 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs Version: 2.3.4 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD-3-Clause @@ -137,6 +137,9 @@ exit $ret %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jan 18 2025 Fedora Release Engineering - 2.3.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild