From 2f59c95688101d44a802e52cbc5274c44846062d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:58:47 +0000 Subject: [PATCH 1/4] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-yoast-phpunit-polyfills.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-yoast-phpunit-polyfills.spec b/php-yoast-phpunit-polyfills.spec index 28c01f2..53a1a69 100644 --- a/php-yoast-phpunit-polyfills.spec +++ b/php-yoast-phpunit-polyfills.spec @@ -24,7 +24,7 @@ Name: php-%{pk_vendor}-%{pk_project} Version: 3.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Set of polyfills for changed PHPUnit functionality, version %{major} License: BSD-3-Clause @@ -125,6 +125,9 @@ exit $ret %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 3.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jan 9 2025 Remi Collet - 3.1.0-1 - update to 3.1.0 - re-license spec file to CECILL-2.1 From 873502170ee6928f33eddfe901034cebfe615fab Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 11 Feb 2025 07:54:23 +0100 Subject: [PATCH 2/4] update to 4.0.0 move to /usr/share/php/Yoast/PHPUnitPolyfills4 raise dependency on PHP 7.1 add phpunit12 --- .gitignore | 1 + php-yoast-phpunit-polyfills.spec | 33 ++++++++++++++++++++++++-------- sources | 2 +- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 35864c7..b92028a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /php-yoast-phpunit-polyfills-2.0.1-4a088f1.tgz /php-yoast-phpunit-polyfills-3.0.0-19e6d5f.tgz /php-yoast-phpunit-polyfills-3.1.0-59b3f8f.tgz +/php-yoast-phpunit-polyfills-4.0.0-134921b.tgz diff --git a/php-yoast-phpunit-polyfills.spec b/php-yoast-phpunit-polyfills.spec index 53a1a69..9989562 100644 --- a/php-yoast-phpunit-polyfills.spec +++ b/php-yoast-phpunit-polyfills.spec @@ -7,7 +7,7 @@ # Please preserve changelog entries # # Github -%global gh_commit 59b3f8ffa2eab9c8258e8638d97c3e37fac9a80e +%global gh_commit 134921bfca9b02d8f374c48381451da1d98402f9 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner Yoast %global gh_project PHPUnit-Polyfills @@ -18,13 +18,13 @@ %global ns_vendor Yoast %global ns_project PHPUnitPolyfills # don't change major version used in package name -%global major 3 +%global major 4 %bcond_without tests %global php_home %{_datadir}/php Name: php-%{pk_vendor}-%{pk_project} -Version: 3.1.0 -Release: 2%{?dist} +Version: 4.0.0 +Release: 1%{?dist} Summary: Set of polyfills for changed PHPUnit functionality, version %{major} License: BSD-3-Clause @@ -35,10 +35,14 @@ Source1: makesrc.sh BuildArch: noarch %if %{with tests} -BuildRequires: php(language) >= 7.0 +BuildRequires: php(language) >= 7.1 BuildRequires: php-reflection # From composer.json, "require-dev": { # "yoast/yoastcs": "^2.3.0" +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 10 +BuildRequires: phpunit12 +BuildRequires: phpunit11 +%endif # phpunit10 is not supported BuildRequires: phpunit9 BuildRequires: phpunit8 @@ -46,9 +50,9 @@ BuildRequires: phpunit8 BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { -# "php": ">=7.0", -# "phpunit/phpunit": "^6.4.4 || ^7.0 || ^8.0 || ^9.0 || ^11.0" -Requires: php(language) >= 7.0 +# "php": ">=7.1", +# "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0 || ^11.0 || ^12.0" +Requires: php(language) >= 7.1 # from phpcompatinfo report on version 0.2.0 Requires: php-reflection @@ -112,6 +116,13 @@ if [ -x %{_bindir}/phpunit11 ]; then fi done fi +if [ -x %{_bindir}/phpunit12 ]; then + for cmd in php php83 php84; do + if which $cmd; then + $cmd %{_bindir}/phpunit11 --no-coverage || ret=1 + fi + done +fi exit $ret %endif @@ -125,6 +136,12 @@ exit $ret %changelog +* Mon Feb 10 2025 Remi Collet - 4.0.0-1 +- update to 4.0.0 +- move to /usr/share/php/Yoast/PHPUnitPolyfills4 +- raise dependency on PHP 7.1 +- add phpunit12 + * Sat Jan 18 2025 Fedora Release Engineering - 3.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 0af7009..d4fd0e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-yoast-phpunit-polyfills-3.1.0-59b3f8f.tgz) = f3d3e5548b16372f0f80eadc2583da51907d5b13d897dd8d2536a98ad7a98af71de19ee525896f1608f31a038b31cc713bf24cf00731f9f23ccef392c3ba521b +SHA512 (php-yoast-phpunit-polyfills-4.0.0-134921b.tgz) = 7f2995809279b01260c6aedf5a97957a18fb39f41c00d66ab442129aea5b5e2220b42e56e72dcfecd679c715aab62dedb59af8761fb8773b60278dfd25608be7 From 29e87f2cf706ef6a2cc6038801ce34a2f753cf5b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 11 Feb 2025 07:54:23 +0100 Subject: [PATCH 3/4] update to 4.0.0 move to /usr/share/php/Yoast/PHPUnitPolyfills4 raise dependency on PHP 7.1 add phpunit12 (cherry picked from commit 873502170ee6928f33eddfe901034cebfe615fab) --- .gitignore | 1 + php-yoast-phpunit-polyfills.spec | 31 ++++++++++++++++++++++++------- sources | 2 +- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 35864c7..b92028a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /php-yoast-phpunit-polyfills-2.0.1-4a088f1.tgz /php-yoast-phpunit-polyfills-3.0.0-19e6d5f.tgz /php-yoast-phpunit-polyfills-3.1.0-59b3f8f.tgz +/php-yoast-phpunit-polyfills-4.0.0-134921b.tgz diff --git a/php-yoast-phpunit-polyfills.spec b/php-yoast-phpunit-polyfills.spec index 28c01f2..c4118c8 100644 --- a/php-yoast-phpunit-polyfills.spec +++ b/php-yoast-phpunit-polyfills.spec @@ -7,7 +7,7 @@ # Please preserve changelog entries # # Github -%global gh_commit 59b3f8ffa2eab9c8258e8638d97c3e37fac9a80e +%global gh_commit 134921bfca9b02d8f374c48381451da1d98402f9 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner Yoast %global gh_project PHPUnit-Polyfills @@ -18,12 +18,12 @@ %global ns_vendor Yoast %global ns_project PHPUnitPolyfills # don't change major version used in package name -%global major 3 +%global major 4 %bcond_without tests %global php_home %{_datadir}/php Name: php-%{pk_vendor}-%{pk_project} -Version: 3.1.0 +Version: 4.0.0 Release: 1%{?dist} Summary: Set of polyfills for changed PHPUnit functionality, version %{major} @@ -35,10 +35,14 @@ Source1: makesrc.sh BuildArch: noarch %if %{with tests} -BuildRequires: php(language) >= 7.0 +BuildRequires: php(language) >= 7.1 BuildRequires: php-reflection # From composer.json, "require-dev": { # "yoast/yoastcs": "^2.3.0" +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 10 +BuildRequires: phpunit12 +BuildRequires: phpunit11 +%endif # phpunit10 is not supported BuildRequires: phpunit9 BuildRequires: phpunit8 @@ -46,9 +50,9 @@ BuildRequires: phpunit8 BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { -# "php": ">=7.0", -# "phpunit/phpunit": "^6.4.4 || ^7.0 || ^8.0 || ^9.0 || ^11.0" -Requires: php(language) >= 7.0 +# "php": ">=7.1", +# "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0 || ^11.0 || ^12.0" +Requires: php(language) >= 7.1 # from phpcompatinfo report on version 0.2.0 Requires: php-reflection @@ -112,6 +116,13 @@ if [ -x %{_bindir}/phpunit11 ]; then fi done fi +if [ -x %{_bindir}/phpunit12 ]; then + for cmd in php php83 php84; do + if which $cmd; then + $cmd %{_bindir}/phpunit11 --no-coverage || ret=1 + fi + done +fi exit $ret %endif @@ -125,6 +136,12 @@ exit $ret %changelog +* Mon Feb 10 2025 Remi Collet - 4.0.0-1 +- update to 4.0.0 +- move to /usr/share/php/Yoast/PHPUnitPolyfills4 +- raise dependency on PHP 7.1 +- add phpunit12 + * Thu Jan 9 2025 Remi Collet - 3.1.0-1 - update to 3.1.0 - re-license spec file to CECILL-2.1 diff --git a/sources b/sources index 0af7009..d4fd0e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-yoast-phpunit-polyfills-3.1.0-59b3f8f.tgz) = f3d3e5548b16372f0f80eadc2583da51907d5b13d897dd8d2536a98ad7a98af71de19ee525896f1608f31a038b31cc713bf24cf00731f9f23ccef392c3ba521b +SHA512 (php-yoast-phpunit-polyfills-4.0.0-134921b.tgz) = 7f2995809279b01260c6aedf5a97957a18fb39f41c00d66ab442129aea5b5e2220b42e56e72dcfecd679c715aab62dedb59af8761fb8773b60278dfd25608be7 From 455602a1a6186729cf469c4bd78d3619ddb055f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:41:08 +0000 Subject: [PATCH 4/4] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-yoast-phpunit-polyfills.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-yoast-phpunit-polyfills.spec b/php-yoast-phpunit-polyfills.spec index 9989562..6c0b64f 100644 --- a/php-yoast-phpunit-polyfills.spec +++ b/php-yoast-phpunit-polyfills.spec @@ -24,7 +24,7 @@ Name: php-%{pk_vendor}-%{pk_project} Version: 4.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Set of polyfills for changed PHPUnit functionality, version %{major} License: BSD-3-Clause @@ -136,6 +136,9 @@ exit $ret %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 4.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Feb 10 2025 Remi Collet - 4.0.0-1 - update to 4.0.0 - move to /usr/share/php/Yoast/PHPUnitPolyfills4