From b05bd62051b278486abafe01f80a4484b70fcc2a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 09:20:07 +0000 Subject: [PATCH 01/11] 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 9a23239762fd773c452e8a647f74e83fc4162f5c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Jun 2023 08:03:02 +0200 Subject: [PATCH 02/11] v2.3.3 --- .gitignore | 1 + php-sabre-uri2.spec | 22 ++++++++++++++-------- sources | 2 +- 3 files changed, 16 insertions(+), 9 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 0327303..ea01c2f 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 +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 + * Mon Sep 19 2022 Remi Collet - 2.3.2-1 - update to 2.3.2 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 369ada105d0a320d26850a511113fb8b567f69ca Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Jun 2023 08:03:02 +0200 Subject: [PATCH 03/11] 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 04/11] 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 05/11] 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 06/11] 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 07/11] 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 08/11] 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 09/11] 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 10/11] 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 11/11] 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