From 6cbe70ad58adc0af63f243c664b929c877587bf6 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 31 Mar 2023 10:36:25 +0200
Subject: [PATCH] v1.0.5

(cherry picked from commit 9705ead959c52db8934e48e5fe8b1676d781ee4b)
---
 .gitignore                       |  1 +
 php-yoast-phpunit-polyfills.spec | 46 ++++++++++----------------------
 sources                          |  2 +-
 3 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5e1bea8..6fb5179 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /php-yoast-phpunit-polyfills-1.0.2-1a582ab.tgz
 /php-yoast-phpunit-polyfills-1.0.3-5ea3536.tgz
 /php-yoast-phpunit-polyfills-1.0.4-3c621ff.tgz
+/php-yoast-phpunit-polyfills-1.0.5-3b59ade.tgz
diff --git a/php-yoast-phpunit-polyfills.spec b/php-yoast-phpunit-polyfills.spec
index ba77032..9001137 100644
--- 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
 #
-# Copyright (c) 2020-2022 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2020-2023 Remi Collet
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please preserve changelog entries
 #
 # Github
-%global gh_commit    3c621ff5429d2b1ff96dc5808ad6cde99d31ea4c
+%global gh_commit    3b59adeef77fb1c03ff5381dbb9d68b0aaff3171
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     Yoast
 %global gh_project   PHPUnit-Polyfills
@@ -23,11 +23,11 @@
 %global php_home     %{_datadir}/php
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        1.0.4
+Version:        1.0.5
 Release:        1%{?dist}
 Summary:        Set of polyfills for changed PHPUnit functionality
 
-License:        BSD
+License:        BSD-3-Clause
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 # git snapshot to get upstream test suite
 Source0:        %{name}-%{version}-%{gh_short}.tgz
@@ -38,17 +38,11 @@ BuildArch:      noarch
 BuildRequires:  php(language) >= 5.4
 BuildRequires:  php-reflection
 # From composer.json, "require-dev": {
-#        "yoast/yoastcs": "^2.2.0"
-%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
+#        "yoast/yoastcs": "^2.3.0"
 BuildRequires:  phpunit9
-%endif
 BuildRequires:  phpunit8
-%if 0%{?fedora} < 35 && 0%{?rhel} < 9
-BuildRequires:  phpunit7
-BuildRequires:  phpunit
 %endif
 BuildRequires:  php-fedora-autoloader-devel
-%endif
 
 # From composer.json, "require": {
 #        "php": ">=5.4",
@@ -97,37 +91,22 @@ EOF
 : Run upstream test suite
 ret=0
 if [ -x %{_bindir}/phpunit ]; then
-  for cmd in php php71 php72 php73 php74; do
-    if which $cmd; then
-      $cmd %{_bindir}/phpunit --no-coverage --verbose || ret=1
-    fi
-  done
-fi
-if [ -x %{_bindir}/phpunit6 ]; then
-  for cmd in php php71 php72 php73 php74; do
-    if which $cmd; then
-      $cmd %{_bindir}/phpunit6 --no-coverage --verbose || ret=1
-    fi
-  done
+    %{_bindir}/phpunit --no-coverage || ret=1
 fi
 if [ -x %{_bindir}/phpunit7 ]; then
-  for cmd in php php71 php72 php73 php74; do
-    if which $cmd; then
-      $cmd %{_bindir}/phpunit7 --no-coverage --verbose || ret=1
-    fi
-  done
+    %{_bindir}/phpunit7 --no-coverage || ret=1
 fi
 if [ -x %{_bindir}/phpunit8 ]; then
-  for cmd in php php72 php73 php74 php80 php81; do
+  for cmd in php php80 php81 php82; do
     if which $cmd; then
-      $cmd %{_bindir}/phpunit8 --no-coverage --verbose || ret=1
+      $cmd %{_bindir}/phpunit8 --no-coverage || ret=1
     fi
   done
 fi
 if [ -x %{_bindir}/phpunit9 ]; then
   for cmd in php php80 php81 php82; do
     if which $cmd; then
-      $cmd %{_bindir}/phpunit9 --no-coverage --verbose || ret=1
+      $cmd %{_bindir}/phpunit9 --no-coverage || ret=1
     fi
   done
 fi
@@ -144,6 +123,9 @@ exit $ret
 
 
 %changelog
+* Fri Mar 31 2023 Remi Collet <remi@remirepo.net> - 1.0.5-1
+- update to 1.0.5
+
 * Wed Nov 16 2022 Remi Collet <remi@remirepo.net> - 1.0.4-1
 - update to 1.0.4
 
diff --git a/sources b/sources
index c16fe2c..73b746e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-yoast-phpunit-polyfills-1.0.4-3c621ff.tgz) = 09dbfd72f32454469770dd285cc85dba9e929cf05eb01319f20f5b9cd7da5940ca4b506b5ded2b1e48b30f566f8ed374e9cd9f7eaa93eca626fc5eb073ecad61
+SHA512 (php-yoast-phpunit-polyfills-1.0.5-3b59ade.tgz) = 3596d3d81302ac2edb073829427ef6ce5086e199bc9495400310e21f9200164e8acef9af393141877fb3903bcbd9591d9e5c4d6319ca0f06616cf40d9d56a9d0