v1.1.1

(cherry picked from commit a311acb8c7)
2024-04-09 08:50:37 +02:00
3 changed files with 18 additions and 75 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,7 +6,3 @@
 /php-yoast-phpunit-polyfills-1.0.4-3c621ff.tgz
 /php-yoast-phpunit-polyfills-1.0.5-3b59ade.tgz
 /php-yoast-phpunit-polyfills-1.1.1-a0f7d70.tgz
-/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
--- a/php-yoast-phpunit-polyfills.spec
+++ b/php-yoast-phpunit-polyfills.spec
@ -1,13 +1,13 @@
 # remirepo/fedora spec file for php-yoast-phpunit-polyfills
 #
-# SPDX-FileCopyrightText:  Copyright 2020-2025 Remi Collet
-# SPDX-License-Identifier: CECILL-2.1
-# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+# Copyright (c) 2020-2024 Remi Collet
+# License: CC-BY-SA-4.0
+# http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please preserve changelog entries
 #
 # Github
-%global gh_commit    134921bfca9b02d8f374c48381451da1d98402f9
+%global gh_commit    a0f7d708794a738f328d7b6c94380fd1d6c40446
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     Yoast
 %global gh_project   PHPUnit-Polyfills
@ -18,14 +18,14 @@
 %global ns_vendor    Yoast
 %global ns_project   PHPUnitPolyfills
 # don't change major version used in package name
-%global major        4
+%global major        %nil
 %bcond_without       tests
 %global php_home     %{_datadir}/php

-Name:           php-%{pk_vendor}-%{pk_project}
-Version:        4.0.0
-Release:        2%{?dist}
-Summary:        Set of polyfills for changed PHPUnit functionality, version %{major}
+Name:           php-%{pk_vendor}-%{pk_project}%{major}
+Version:        1.1.1
+Release:        1%{?dist}
+Summary:        Set of polyfills for changed PHPUnit functionality

 License:        BSD-3-Clause
 URL:            https://github.com/%{gh_owner}/%{gh_project}
@ -35,24 +35,19 @@ Source1:        makesrc.sh

 BuildArch:      noarch
 %if %{with tests}
-BuildRequires:  php(language) >= 7.1
+BuildRequires:  php(language) >= 5.4
 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
 %endif
 BuildRequires:  php-fedora-autoloader-devel

 # From composer.json, "require": {
-#               "php": ">=7.1",
-#               "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0 || ^11.0 || ^12.0"
-Requires:       php(language) >= 7.1
+#        "php": ">=5.4",
+#        "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
+Requires:       php(language) >= 5.4
 # from phpcompatinfo report on version 0.2.0
 Requires:       php-reflection

@ -95,6 +90,9 @@ EOF

 : Run upstream test suite
 ret=0
+if [ -x %{_bindir}/phpunit7 ]; then
+    %{_bindir}/phpunit7 --no-coverage || ret=1
+fi
 if [ -x %{_bindir}/phpunit8 ]; then
  for cmd in php php81 php82 php83; do
    if which $cmd; then
@ -103,26 +101,12 @@ if [ -x %{_bindir}/phpunit8 ]; then
  done
 fi
 if [ -x %{_bindir}/phpunit9 ]; then
-  for cmd in php php81 php82 php83 php84; do
+  for cmd in php php81 php82 php83; do
    if which $cmd; then
      $cmd %{_bindir}/phpunit9 --no-coverage || ret=1
    fi
  done
 fi
-if [ -x %{_bindir}/phpunit11 ]; then
-  for cmd in php  php82 php83 php84; do
-    if which $cmd; then
-      $cmd %{_bindir}/phpunit11 --no-coverage || ret=1
-    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
@ -136,46 +120,9 @@ exit $ret


 %changelog
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Feb 10 2025 Remi Collet <remi@remirepo.net> - 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 <releng@fedoraproject.org> - 3.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Jan  9 2025 Remi Collet <remi@remirepo.net> - 3.1.0-1
- update to 3.1.0
- re-license spec file to CECILL-2.1
-
-* Mon Sep  9 2024 Remi Collet <remi@remirepo.net> - 3.0.0-1
- update to 3.0.0
- move to /usr/share/php/Yoast/PHPUnitPolyfills3
- raise dependency on PHP 7.0
- drop phpunit10, add phpunit11
-
-* Fri Aug 30 2024 Remi Collet <remi@remirepo.net> - 2.0.1-1
- update to 2.0.1
- move to /usr/share/php/Yoast/PHPUnitPolyfills2
- raise dependency on PHP 5.6
- drop phpunit7, add phpunit10
-
-* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
 * Tue Apr  9 2024 Remi Collet <remi@remirepo.net> - 1.1.1-1
 - update to 1.1.1

-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
 * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (php-yoast-phpunit-polyfills-4.0.0-134921b.tgz) = 7f2995809279b01260c6aedf5a97957a18fb39f41c00d66ab442129aea5b5e2220b42e56e72dcfecd679c715aab62dedb59af8761fb8773b60278dfd25608be7
+SHA512 (php-yoast-phpunit-polyfills-1.1.1-a0f7d70.tgz) = 5485d22a0122deb3b3af6247bf19b2775c5e3bbdc07ec78c3f535a254f7ac3c23ae3dd49d624625b20e48d070cbe43781dcf488126ceffbf5e4189ff812d3098