From 11ba353c744477ddd03ea16e30e0a7ad22d67e6b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 28 Sep 2020 09:44:34 +0200
Subject: [PATCH 1/3] v5.0.3

(cherry picked from commit fe46c5d99d7a16e9fc487e5141ddf614726d04b3)
---
 .gitignore                  |  2 ++
 php-phpunit-php-timer5.spec | 23 +++++++++++------------
 sources                     |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index e2c0f21..b9c4197 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /php-phpunit-php-timer5-5.0.1-cc49734.tgz
+/php-phpunit-php-timer5-5.0.2-c9ff14f.tgz
+/php-phpunit-php-timer5-5.0.3-5a63ce2.tgz
diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec
index ad4b976..db655cd 100644
--- a/php-phpunit-php-timer5.spec
+++ b/php-phpunit-php-timer5.spec
@@ -7,8 +7,9 @@
 #
 # Please, preserve the changelog entries
 #
-%global bootstrap    1
-%global gh_commit    cc49734779cbb302bf51a44297dab8c4bbf941e7
+%bcond_without       tests
+
+%global gh_commit    5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   php-timer
@@ -21,16 +22,11 @@
 
 %global major        5
 %global php_home     %{_datadir}/php
-%if %{bootstrap}
-%bcond_with          tests
-%else
-%bcond_without       tests
-%endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        5.0.1
+Version:        5.0.3
 Release:        1%{?dist}
-Summary:        PHP Utility class for timing
+Summary:        PHP Utility class for timing, version %{major}
 
 License:        BSD
 URL:            https://github.com/%{gh_owner}/%{gh_project}
@@ -42,12 +38,12 @@ BuildRequires:  php(language) >= 7.3
 BuildRequires:  php-fedora-autoloader-devel
 %if %{with tests}
 # From composer.json"require-dev": {
-#        "phpunit/phpunit": "^9.2"
-BuildRequires:  phpunit9 >= 9.2
+#        "phpunit/phpunit": "^9.3"
+BuildRequires:  phpunit9 >= 9.3
 %endif
 
 # From composer.json
-#        "php": "^7.3 || ^8.0"
+#        "php": ">=7.3"
 Requires:       php(language) >= 7.3
 # From phpcompatinfo report for version 4.0.0
 Requires:       php-spl
@@ -104,6 +100,9 @@ exit $ret
 
 
 %changelog
+* Mon Oct 26 2020 Remi Collet <remi@remirepo.net> - 5.0.3-1
+- update to 5.0.3
+
 * Fri Jun 26 2020 Remi Collet <remi@remirepo.net> - 5.0.1-1
 - update to 5.0.1
 
diff --git a/sources b/sources
index a597e73..c59fad6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-phpunit-php-timer5-5.0.1-cc49734.tgz) = 5ac0f3a4bbd1fda51018a3f01c84e955e2b41a398ea6f21a89efa236119289d97492357bf6b2789c6e8db6fbf29b31c93e452e778ddd4f796980d2405f230c4f
+SHA512 (php-phpunit-php-timer5-5.0.3-5a63ce2.tgz) = 798a4d78bde219747996ae56d83092fe0d070790ed7c1395c04b51e5dfb836e0021ad789341297e5abe7b3a15f428ca270bff6611c18e938cdf1cf7b86adcb84

From 2d984c366bbc3d10ed03d409cabe141e2bcff106 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 26 Oct 2020 15:37:56 +0100
Subject: [PATCH 2/3] skip 1 test on 32-bit

(cherry picked from commit afab8e8a0bd492922770447dc97432fa456e035f)
---
 php-phpunit-php-timer5.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec
index db655cd..1599480 100644
--- a/php-phpunit-php-timer5.spec
+++ b/php-phpunit-php-timer5.spec
@@ -84,7 +84,11 @@ ret=0
 for cmd in php php73 php74 php80; do
   if which $cmd; then
     $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
-      %{_bindir}/phpunit9 --verbose || ret=1
+      %{_bindir}/phpunit9 \
+%if %{__isa_bits} < 64
+        --filter '^((?!(testCanBeFormattedAsString)).)*$' \
+%endif
+        --verbose || ret=1
   fi
 done
 exit $ret
@@ -102,6 +106,8 @@ exit $ret
 %changelog
 * Mon Oct 26 2020 Remi Collet <remi@remirepo.net> - 5.0.3-1
 - update to 5.0.3
+- open https://github.com/sebastianbergmann/php-timer/issues/34
+  32-bit compatibility
 
 * Fri Jun 26 2020 Remi Collet <remi@remirepo.net> - 5.0.1-1
 - update to 5.0.1

From 4ab76588852d8b80c5d9e0c64c653933170bad4c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 26 Oct 2020 15:44:11 +0100
Subject: [PATCH 3/3] fix arch detection

(cherry picked from commit 19d9d50b1232b6f7bf75815d3677c229c412f579)
---
 php-phpunit-php-timer5.spec | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec
index 1599480..d10b599 100644
--- a/php-phpunit-php-timer5.spec
+++ b/php-phpunit-php-timer5.spec
@@ -81,13 +81,14 @@ touch vendor/autoload.php
 
 : Run upstream test suite
 ret=0
+if [ $(php -r 'echo PHP_INT_SIZE;') -lt 8 ]; then
+  filter="--filter '^((?!(testCanBeFormattedAsString)).)*$'"
+fi
 for cmd in php php73 php74 php80; do
   if which $cmd; then
     $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
       %{_bindir}/phpunit9 \
-%if %{__isa_bits} < 64
-        --filter '^((?!(testCanBeFormattedAsString)).)*$' \
-%endif
+        $filter  \
         --verbose || ret=1
   fi
 done