From 10e03eba24a90ff5acf7d0e40590d4cd870e8469 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 13 Jul 2018 22:03:05 +0000
Subject: [PATCH 01/25] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-phpunit-php-timer2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index d46da68..56e1b8e 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -29,7 +29,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PHP Utility class for timing
 
 Group:          Development/Libraries
@@ -104,6 +104,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Feb  7 2018 Remi Collet <remi@remirepo.net> - 2.0.0-1
 - normal build
 

From b8f841a1541a04cdd11613eeaa3aca9a45b8bc62 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:18:12 +0100
Subject: [PATCH 02/25] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 php-phpunit-php-timer2.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index 56e1b8e..6b6e5bc 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -32,7 +32,6 @@ Version:        2.0.0
 Release:        2%{?dist}
 Summary:        PHP Utility class for timing
 
-Group:          Development/Libraries
 License:        BSD
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz

From 3cdfcb7dbf2a715349eba6e747eaa950a144adb2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 2 Feb 2019 03:33:47 +0000
Subject: [PATCH 03/25] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-phpunit-php-timer2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index 6b6e5bc..2cea929 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -29,7 +29,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        2.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD
@@ -103,6 +103,9 @@ exit $ret
 
 
 %changelog
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From a8dcf3ae619c40864d5a911eddb2d44b52c2a1af Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 20 Feb 2019 14:09:02 +0100
Subject: [PATCH 04/25] v2.1.1

---
 .gitignore                  |  1 +
 php-phpunit-php-timer2.spec | 13 ++++++++-----
 sources                     |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8aef692..b5a21d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /php-phpunit-php-timer2-2.0.0-8b8454e.tar.gz
+/php-phpunit-php-timer2-2.1.1-8b389ae.tar.gz
diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index 2cea929..5f1001e 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-phpunit-php-timer2
 #
-# Copyright (c) 2010-2018 Christof Damian, Remi Collet
+# Copyright (c) 2010-2019 Christof Damian, Remi Collet
 #
 # License: MIT
 # http://opensource.org/licenses/MIT
@@ -8,7 +8,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    8b8454ea6958c3dee38453d3bd571e023108c91f
+%global gh_commit    8b389aebe1b8b0578430bda0c7c95a829608e059
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   php-timer
@@ -28,8 +28,8 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        2.0.0
-Release:        3%{?dist}
+Version:        2.1.1
+Release:        1%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD
@@ -84,7 +84,7 @@ touch vendor/autoload.php
 
 : Run upstream test suite
 ret=0
-for cmd in php php71 php72; do
+for cmd in php php71 php72 php73; do
   if which $cmd; then
     $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php \
       %{_bindir}/phpunit7 --verbose || ret=1
@@ -103,6 +103,9 @@ exit $ret
 
 
 %changelog
+* Wed Feb 20 2019 Remi Collet <remi@remirepo.net> - 2.1.1-1
+- update to 2.1.1
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 04d5954..329c839 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-phpunit-php-timer2-2.0.0-8b8454e.tar.gz) = 54a1ea015b8cd8850fcf9bafd66ffee9b8cc78ef9402ee3fb68d85f0647fb889d6ba648bc20b5c23b7148c1693ca16669f4f1fdfa760705c09351bba7750df6b
+SHA512 (php-phpunit-php-timer2-2.1.1-8b389ae.tar.gz) = 8801280c65fbe238193e7ab26250fb120f15b2251e379d8de7f81a8fd7c48407921ad097916fddbf1b53c56af3011acccb9143127bb814a80de0b29745e46973

From 39722264fa32a56dd2de9fda6d0c3a87b8c2b0c4 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 20 Feb 2019 14:09:02 +0100
Subject: [PATCH 05/25] v2.1.1

(cherry picked from commit a8dcf3ae619c40864d5a911eddb2d44b52c2a1af)
---
 .gitignore                  |  1 +
 php-phpunit-php-timer2.spec | 12 +++++++-----
 sources                     |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8aef692..b5a21d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /php-phpunit-php-timer2-2.0.0-8b8454e.tar.gz
+/php-phpunit-php-timer2-2.1.1-8b389ae.tar.gz
diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index d46da68..c6a5519 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-phpunit-php-timer2
 #
-# Copyright (c) 2010-2018 Christof Damian, Remi Collet
+# Copyright (c) 2010-2019 Christof Damian, Remi Collet
 #
 # License: MIT
 # http://opensource.org/licenses/MIT
@@ -8,7 +8,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    8b8454ea6958c3dee38453d3bd571e023108c91f
+%global gh_commit    8b389aebe1b8b0578430bda0c7c95a829608e059
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   php-timer
@@ -28,11 +28,10 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        2.0.0
+Version:        2.1.1
 Release:        1%{?dist}
 Summary:        PHP Utility class for timing
 
-Group:          Development/Libraries
 License:        BSD
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
@@ -85,7 +84,7 @@ touch vendor/autoload.php
 
 : Run upstream test suite
 ret=0
-for cmd in php php71 php72; do
+for cmd in php php71 php72 php73; do
   if which $cmd; then
     $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php \
       %{_bindir}/phpunit7 --verbose || ret=1
@@ -104,6 +103,9 @@ exit $ret
 
 
 %changelog
+* Wed Feb 20 2019 Remi Collet <remi@remirepo.net> - 2.1.1-1
+- update to 2.1.1
+
 * Wed Feb  7 2018 Remi Collet <remi@remirepo.net> - 2.0.0-1
 - normal build
 
diff --git a/sources b/sources
index 04d5954..329c839 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-phpunit-php-timer2-2.0.0-8b8454e.tar.gz) = 54a1ea015b8cd8850fcf9bafd66ffee9b8cc78ef9402ee3fb68d85f0647fb889d6ba648bc20b5c23b7148c1693ca16669f4f1fdfa760705c09351bba7750df6b
+SHA512 (php-phpunit-php-timer2-2.1.1-8b389ae.tar.gz) = 8801280c65fbe238193e7ab26250fb120f15b2251e379d8de7f81a8fd7c48407921ad097916fddbf1b53c56af3011acccb9143127bb814a80de0b29745e46973

From 0d0909e4e61f63fcc950a501ad5514aeb7d625b0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 20 Feb 2019 15:42:25 +0100
Subject: [PATCH 06/25] add patch from
 https://github.com/sebastianbergmann/php-timer/pull/21   fix for 32-bit where
 large value are converted to float

---
 21.patch                    | 70 +++++++++++++++++++++++++++++++++++++
 php-phpunit-php-timer2.spec |  9 ++++-
 2 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 21.patch

diff --git a/21.patch b/21.patch
new file mode 100644
index 0000000..c633abd
--- /dev/null
+++ b/21.patch
@@ -0,0 +1,70 @@
+From d07774e18e532336361f2b59c039099fae512898 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 20 Feb 2019 14:52:09 +0100
+Subject: [PATCH 1/2] fix for 32-bit where large value are converted to float
+
+---
+ src/Timer.php       | 4 ++--
+ tests/TimerTest.php | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/Timer.php b/src/Timer.php
+index 8f919b6..9ad76dc 100644
+--- a/src/Timer.php
++++ b/src/Timer.php
+@@ -44,7 +44,7 @@ public static function stop(): float
+         return \microtime(true) - \array_pop(self::$startTimes);
+     }
+ 
+-    public static function bytesToString(int $bytes): string
++    public static function bytesToString(float $bytes): string
+     {
+         foreach (self::$sizes as $unit => $value) {
+             if ($bytes >= $value) {
+@@ -54,7 +54,7 @@ public static function bytesToString(int $bytes): string
+             }
+         }
+ 
+-        return $bytes . ' byte' . ($bytes !== 1 ? 's' : '');
++        return $bytes . ' byte' . ((int)$bytes !== 1 ? 's' : '');
+     }
+ 
+     public static function secondsToTimeString(float $time): string
+diff --git a/tests/TimerTest.php b/tests/TimerTest.php
+index e8cf7ef..93cc474 100644
+--- a/tests/TimerTest.php
++++ b/tests/TimerTest.php
+@@ -112,7 +112,7 @@ public function secondsProvider(): array
+     /**
+      * @dataProvider bytesProvider
+      */
+-    public function testCanFormatBytesAsString(string $string, int $bytes): void
++    public function testCanFormatBytesAsString(string $string, float $bytes): void
+     {
+         $this->assertEquals($string, Timer::bytesToString($bytes));
+     }
+
+From 9398c85d883eec73ab9fddb4d72d42091425791b Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 20 Feb 2019 15:02:00 +0100
+Subject: [PATCH 2/2] simplify code
+
+---
+ src/Timer.php | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/Timer.php b/src/Timer.php
+index 9ad76dc..c78a6ee 100644
+--- a/src/Timer.php
++++ b/src/Timer.php
+@@ -48,9 +48,7 @@ public static function bytesToString(float $bytes): string
+     {
+         foreach (self::$sizes as $unit => $value) {
+             if ($bytes >= $value) {
+-                $size = \sprintf('%.2f', $bytes >= 1024 ? $bytes / $value : $bytes);
+-
+-                return $size . ' ' . $unit;
++                return \sprintf('%.2f %s', $bytes >= 1024 ? $bytes / $value : $bytes, $unit);
+             }
+         }
+ 
diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index 5f1001e..54f3ee7 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -29,13 +29,15 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        2.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
 
+Patch0:         https://patch-diff.githubusercontent.com/raw/sebastianbergmann/php-timer/pull/21.patch
+
 BuildArch:      noarch
 BuildRequires:  php(language) >= 7.1
 BuildRequires:  php-fedora-autoloader-devel
@@ -63,6 +65,7 @@ component.
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
+%patch0 -p1
 
 
 %build
@@ -103,6 +106,10 @@ exit $ret
 
 
 %changelog
+* Wed Feb 20 2019 Remi Collet <remi@remirepo.net> - 2.1.1-2
+- add patch from https://github.com/sebastianbergmann/php-timer/pull/21
+  fix for 32-bit where large value are converted to float
+
 * Wed Feb 20 2019 Remi Collet <remi@remirepo.net> - 2.1.1-1
 - update to 2.1.1
 

From 05204130585b350b240945ba5b66ce3eaf1e17e6 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 20 Feb 2019 15:42:25 +0100
Subject: [PATCH 07/25] add patch from
 https://github.com/sebastianbergmann/php-timer/pull/21   fix for 32-bit where
 large value are converted to float

(cherry picked from commit 0d0909e4e61f63fcc950a501ad5514aeb7d625b0)
---
 21.patch                    | 70 +++++++++++++++++++++++++++++++++++++
 php-phpunit-php-timer2.spec |  9 ++++-
 2 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 21.patch

diff --git a/21.patch b/21.patch
new file mode 100644
index 0000000..c633abd
--- /dev/null
+++ b/21.patch
@@ -0,0 +1,70 @@
+From d07774e18e532336361f2b59c039099fae512898 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 20 Feb 2019 14:52:09 +0100
+Subject: [PATCH 1/2] fix for 32-bit where large value are converted to float
+
+---
+ src/Timer.php       | 4 ++--
+ tests/TimerTest.php | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/Timer.php b/src/Timer.php
+index 8f919b6..9ad76dc 100644
+--- a/src/Timer.php
++++ b/src/Timer.php
+@@ -44,7 +44,7 @@ public static function stop(): float
+         return \microtime(true) - \array_pop(self::$startTimes);
+     }
+ 
+-    public static function bytesToString(int $bytes): string
++    public static function bytesToString(float $bytes): string
+     {
+         foreach (self::$sizes as $unit => $value) {
+             if ($bytes >= $value) {
+@@ -54,7 +54,7 @@ public static function bytesToString(int $bytes): string
+             }
+         }
+ 
+-        return $bytes . ' byte' . ($bytes !== 1 ? 's' : '');
++        return $bytes . ' byte' . ((int)$bytes !== 1 ? 's' : '');
+     }
+ 
+     public static function secondsToTimeString(float $time): string
+diff --git a/tests/TimerTest.php b/tests/TimerTest.php
+index e8cf7ef..93cc474 100644
+--- a/tests/TimerTest.php
++++ b/tests/TimerTest.php
+@@ -112,7 +112,7 @@ public function secondsProvider(): array
+     /**
+      * @dataProvider bytesProvider
+      */
+-    public function testCanFormatBytesAsString(string $string, int $bytes): void
++    public function testCanFormatBytesAsString(string $string, float $bytes): void
+     {
+         $this->assertEquals($string, Timer::bytesToString($bytes));
+     }
+
+From 9398c85d883eec73ab9fddb4d72d42091425791b Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 20 Feb 2019 15:02:00 +0100
+Subject: [PATCH 2/2] simplify code
+
+---
+ src/Timer.php | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/Timer.php b/src/Timer.php
+index 9ad76dc..c78a6ee 100644
+--- a/src/Timer.php
++++ b/src/Timer.php
+@@ -48,9 +48,7 @@ public static function bytesToString(float $bytes): string
+     {
+         foreach (self::$sizes as $unit => $value) {
+             if ($bytes >= $value) {
+-                $size = \sprintf('%.2f', $bytes >= 1024 ? $bytes / $value : $bytes);
+-
+-                return $size . ' ' . $unit;
++                return \sprintf('%.2f %s', $bytes >= 1024 ? $bytes / $value : $bytes, $unit);
+             }
+         }
+ 
diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index c6a5519..66203d8 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -29,13 +29,15 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        2.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
 
+Patch0:         https://patch-diff.githubusercontent.com/raw/sebastianbergmann/php-timer/pull/21.patch
+
 BuildArch:      noarch
 BuildRequires:  php(language) >= 7.1
 BuildRequires:  php-fedora-autoloader-devel
@@ -63,6 +65,7 @@ component.
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
+%patch0 -p1
 
 
 %build
@@ -103,6 +106,10 @@ exit $ret
 
 
 %changelog
+* Wed Feb 20 2019 Remi Collet <remi@remirepo.net> - 2.1.1-2
+- add patch from https://github.com/sebastianbergmann/php-timer/pull/21
+  fix for 32-bit where large value are converted to float
+
 * Wed Feb 20 2019 Remi Collet <remi@remirepo.net> - 2.1.1-1
 - update to 2.1.1
 

From 951017ffb60fdcb9ddea1bbe4c6d683b80bc691d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 7 Jun 2019 08:25:22 +0200
Subject: [PATCH 08/25] update to 2.1.2 drop patch merged upstream

---
 .gitignore                  |  1 +
 21.patch                    | 70 -------------------------------------
 php-phpunit-php-timer2.spec | 15 ++++----
 sources                     |  2 +-
 4 files changed, 10 insertions(+), 78 deletions(-)
 delete mode 100644 21.patch

diff --git a/.gitignore b/.gitignore
index b5a21d1..ecc89e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /php-phpunit-php-timer2-2.0.0-8b8454e.tar.gz
 /php-phpunit-php-timer2-2.1.1-8b389ae.tar.gz
+/php-phpunit-php-timer2-2.1.2-1038454.tar.gz
diff --git a/21.patch b/21.patch
deleted file mode 100644
index c633abd..0000000
--- a/21.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From d07774e18e532336361f2b59c039099fae512898 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 20 Feb 2019 14:52:09 +0100
-Subject: [PATCH 1/2] fix for 32-bit where large value are converted to float
-
----
- src/Timer.php       | 4 ++--
- tests/TimerTest.php | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/Timer.php b/src/Timer.php
-index 8f919b6..9ad76dc 100644
---- a/src/Timer.php
-+++ b/src/Timer.php
-@@ -44,7 +44,7 @@ public static function stop(): float
-         return \microtime(true) - \array_pop(self::$startTimes);
-     }
- 
--    public static function bytesToString(int $bytes): string
-+    public static function bytesToString(float $bytes): string
-     {
-         foreach (self::$sizes as $unit => $value) {
-             if ($bytes >= $value) {
-@@ -54,7 +54,7 @@ public static function bytesToString(int $bytes): string
-             }
-         }
- 
--        return $bytes . ' byte' . ($bytes !== 1 ? 's' : '');
-+        return $bytes . ' byte' . ((int)$bytes !== 1 ? 's' : '');
-     }
- 
-     public static function secondsToTimeString(float $time): string
-diff --git a/tests/TimerTest.php b/tests/TimerTest.php
-index e8cf7ef..93cc474 100644
---- a/tests/TimerTest.php
-+++ b/tests/TimerTest.php
-@@ -112,7 +112,7 @@ public function secondsProvider(): array
-     /**
-      * @dataProvider bytesProvider
-      */
--    public function testCanFormatBytesAsString(string $string, int $bytes): void
-+    public function testCanFormatBytesAsString(string $string, float $bytes): void
-     {
-         $this->assertEquals($string, Timer::bytesToString($bytes));
-     }
-
-From 9398c85d883eec73ab9fddb4d72d42091425791b Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 20 Feb 2019 15:02:00 +0100
-Subject: [PATCH 2/2] simplify code
-
----
- src/Timer.php | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/Timer.php b/src/Timer.php
-index 9ad76dc..c78a6ee 100644
---- a/src/Timer.php
-+++ b/src/Timer.php
-@@ -48,9 +48,7 @@ public static function bytesToString(float $bytes): string
-     {
-         foreach (self::$sizes as $unit => $value) {
-             if ($bytes >= $value) {
--                $size = \sprintf('%.2f', $bytes >= 1024 ? $bytes / $value : $bytes);
--
--                return $size . ' ' . $unit;
-+                return \sprintf('%.2f %s', $bytes >= 1024 ? $bytes / $value : $bytes, $unit);
-             }
-         }
- 
diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index 54f3ee7..19c42f9 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -8,7 +8,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    8b389aebe1b8b0578430bda0c7c95a829608e059
+%global gh_commit    1038454804406b0b5f5f520358e78c1c2f71501e
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   php-timer
@@ -28,16 +28,14 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        2.1.1
-Release:        2%{?dist}
+Version:        2.1.2
+Release:        1%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
 
-Patch0:         https://patch-diff.githubusercontent.com/raw/sebastianbergmann/php-timer/pull/21.patch
-
 BuildArch:      noarch
 BuildRequires:  php(language) >= 7.1
 BuildRequires:  php-fedora-autoloader-devel
@@ -65,7 +63,6 @@ component.
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1
 
 
 %build
@@ -87,7 +84,7 @@ touch vendor/autoload.php
 
 : Run upstream test suite
 ret=0
-for cmd in php php71 php72 php73; do
+for cmd in php php71 php72 php73 php74; do
   if which $cmd; then
     $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php \
       %{_bindir}/phpunit7 --verbose || ret=1
@@ -106,6 +103,10 @@ exit $ret
 
 
 %changelog
+* Fri Jun  7 2019 Remi Collet <remi@remirepo.net> - 2.1.2-1
+- update to 2.1.2
+- drop patch merged upstream
+
 * Wed Feb 20 2019 Remi Collet <remi@remirepo.net> - 2.1.1-2
 - add patch from https://github.com/sebastianbergmann/php-timer/pull/21
   fix for 32-bit where large value are converted to float
diff --git a/sources b/sources
index 329c839..e36a49e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-phpunit-php-timer2-2.1.1-8b389ae.tar.gz) = 8801280c65fbe238193e7ab26250fb120f15b2251e379d8de7f81a8fd7c48407921ad097916fddbf1b53c56af3011acccb9143127bb814a80de0b29745e46973
+SHA512 (php-phpunit-php-timer2-2.1.2-1038454.tar.gz) = b035f63bb5192629eeaf794e38885de471d3e8f90c2402231e7ded14b2cdfc502a870e657d77b7c5e5d85d1ed9355af3c093de2eaf75a882af101c4dd39cbf3b

From 497960ab6d0cb64e240abfe8ddfedff3328dbee3 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 26 Jul 2019 10:01:20 +0000
Subject: [PATCH 09/25] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-phpunit-php-timer2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index 19c42f9..f4998b0 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -29,7 +29,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        2.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD
@@ -103,6 +103,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Fri Jun  7 2019 Remi Collet <remi@remirepo.net> - 2.1.2-1
 - update to 2.1.2
 - drop patch merged upstream

From 98a9b599334c97b167ef063d7fb6ff7435b65e46 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 30 Jan 2020 08:31:58 +0000
Subject: [PATCH 10/25] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-phpunit-php-timer2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index f4998b0..90d6dfe 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -29,7 +29,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        2.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD
@@ -103,6 +103,9 @@ exit $ret
 
 
 %changelog
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From a4168b35bb3877bdbf6e3506d69d025fde344890 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jul 2020 22:02:55 +0000
Subject: [PATCH 11/25] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-phpunit-php-timer2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index 90d6dfe..42d3bf5 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -29,7 +29,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        2.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD
@@ -103,6 +103,9 @@ exit $ret
 
 
 %changelog
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 6957c48f2729e6543e4735aefa814a9cd40aad01 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 30 Nov 2020 10:47:09 +0100
Subject: [PATCH 12/25] update to 2.1.3 (no change) switch to phpunit8

---
 .gitignore                  |  1 +
 php-phpunit-php-timer2.spec | 22 +++++++++++++---------
 sources                     |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index ecc89e9..3f91d21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /php-phpunit-php-timer2-2.0.0-8b8454e.tar.gz
 /php-phpunit-php-timer2-2.1.1-8b389ae.tar.gz
 /php-phpunit-php-timer2-2.1.2-1038454.tar.gz
+/php-phpunit-php-timer2-2.1.3-2454ae1.tar.gz
diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index 42d3bf5..b68c8a0 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -8,7 +8,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    1038454804406b0b5f5f520358e78c1c2f71501e
+%global gh_commit    2454ae1765516d20c4ffe103d85a58a9a3bd5662
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   php-timer
@@ -28,8 +28,8 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        2.1.2
-Release:        4%{?dist}
+Version:        2.1.3
+Release:        1%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD
@@ -37,16 +37,16 @@ URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
 
 BuildArch:      noarch
-BuildRequires:  php(language) >= 7.1
+BuildRequires:  php(language) >= 7.2
 BuildRequires:  php-fedora-autoloader-devel
 %if %{with_tests}
 # From composer.json"require-dev": {
-#        "phpunit/phpunit": "^7.0"
-BuildRequires:  phpunit7
+#        "phpunit/phpunit": "^8.5"
+BuildRequires:  phpunit8 >= 8.5
 %endif
 
 # From composer.json
-#        "php": "^7.1"
+#        "php": ">=7.1"
 Requires:       php(language) >= 7.1
 # From phpcompatinfo report for version 2.0.0
 Requires:       php-spl
@@ -84,10 +84,10 @@ touch vendor/autoload.php
 
 : Run upstream test suite
 ret=0
-for cmd in php php71 php72 php73 php74; do
+for cmd in php php72 php73 php74 php80; do
   if which $cmd; then
     $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php \
-      %{_bindir}/phpunit7 --verbose || ret=1
+      %{_bindir}/phpunit8 --verbose || ret=1
   fi
 done
 exit $ret
@@ -103,6 +103,10 @@ exit $ret
 
 
 %changelog
+* Mon Nov 30 2020 Remi Collet <remi@remirepo.net> - 2.1.3-1
+- update to 2.1.3 (no change)
+- switch to phpunit8
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index e36a49e..5071c43 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-phpunit-php-timer2-2.1.2-1038454.tar.gz) = b035f63bb5192629eeaf794e38885de471d3e8f90c2402231e7ded14b2cdfc502a870e657d77b7c5e5d85d1ed9355af3c093de2eaf75a882af101c4dd39cbf3b
+SHA512 (php-phpunit-php-timer2-2.1.3-2454ae1.tar.gz) = ee750b5d57eca9af8a327f50d557d16feae29c487dc6420caf2127e2e6b486010bab95e455bb9da7e487b5d9e2a7cd2d4d2aa19622429cc08d907e0263c2fdd4

From 96b38ce30ed90f092796529e2b961630c6b9b227 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 27 Jan 2021 07:40:00 +0000
Subject: [PATCH 13/25] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-phpunit-php-timer2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index b68c8a0..3dae334 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -29,7 +29,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        2.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD
@@ -103,6 +103,9 @@ exit $ret
 
 
 %changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Nov 30 2020 Remi Collet <remi@remirepo.net> - 2.1.3-1
 - update to 2.1.3 (no change)
 - switch to phpunit8

From 1ceab2c2b63fbf0715e8ae38274c92603878d4d8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 03:05:04 +0000
Subject: [PATCH 14/25] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-phpunit-php-timer2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index 3dae334..e7787a8 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -29,7 +29,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        2.1.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD
@@ -103,6 +103,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From cc569fefdfbd4a889c807ac36fddb89c6e824077 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 21 Jan 2022 08:24:21 +0000
Subject: [PATCH 15/25] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-phpunit-php-timer2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index e7787a8..00d373d 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -29,7 +29,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        2.1.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD
@@ -103,6 +103,9 @@ exit $ret
 
 
 %changelog
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From a081cc01d714de94f55962ebed0b1b0dfdd16ae7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 22 Jul 2022 14:18:11 +0000
Subject: [PATCH 16/25] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-phpunit-php-timer2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index 00d373d..788c2f6 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -29,7 +29,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        2.1.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD
@@ -103,6 +103,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From e7908d923eea3ea0ee94ecddf7c12ee677e746bd Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 20 Jan 2023 09:15:35 +0000
Subject: [PATCH 17/25] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-phpunit-php-timer2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index 788c2f6..7fb461d 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -29,7 +29,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        2.1.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD
@@ -103,6 +103,9 @@ exit $ret
 
 
 %changelog
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 5966f6f86c0f3abff8fd44afaf9b62158244b903 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 20 Apr 2023 16:07:24 +0200
Subject: [PATCH 18/25] use SPDX license ID

---
 php-phpunit-php-timer2.spec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index 7fb461d..eb2de9f 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-phpunit-php-timer2
 #
-# Copyright (c) 2010-2019 Christof Damian, Remi Collet
+# Copyright (c) 2010-2023 Christof Damian, Remi Collet
 #
 # License: MIT
 # http://opensource.org/licenses/MIT
@@ -29,10 +29,10 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        2.1.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        PHP Utility class for timing
 
-License:        BSD
+License:        BSD-3-Clause
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
 
@@ -84,7 +84,7 @@ touch vendor/autoload.php
 
 : Run upstream test suite
 ret=0
-for cmd in php php72 php73 php74 php80; do
+for cmd in php php80 php81 php82; do
   if which $cmd; then
     $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php \
       %{_bindir}/phpunit8 --verbose || ret=1
@@ -103,6 +103,9 @@ exit $ret
 
 
 %changelog
+* Thu Apr 20 2023 Remi Collet <remi@remirepo.net> - 2.1.3-7
+- use SPDX license ID
+
 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 542f2256603bc4621b46a637e6a12ff5e8242a09 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 21 Jul 2023 05:03:16 +0000
Subject: [PATCH 19/25] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-phpunit-php-timer2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index eb2de9f..db58141 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -29,7 +29,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        2.1.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD-3-Clause
@@ -103,6 +103,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Thu Apr 20 2023 Remi Collet <remi@remirepo.net> - 2.1.3-7
 - use SPDX license ID
 

From 8ed9dbb03252c751ca9629a5f9db922641bda08e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 21 Jan 2024 21:19:31 +0000
Subject: [PATCH 20/25] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 php-phpunit-php-timer2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index db58141..f4367a9 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -29,7 +29,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        2.1.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD-3-Clause
@@ -103,6 +103,9 @@ exit $ret
 
 
 %changelog
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From b7d3af0219c6934ca96b3a6a21937f69bcab2123 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jan 2024 23:07:01 +0000
Subject: [PATCH 21/25] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 php-phpunit-php-timer2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index f4367a9..c729dc6 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -29,7 +29,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        2.1.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD-3-Clause
@@ -103,6 +103,9 @@ exit $ret
 
 
 %changelog
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 14c5cec605b9686be24b7c69562b8d6a27edb912 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 5 Mar 2024 11:09:18 +0100
Subject: [PATCH 22/25] update to 2.1.4 (no change)

sources from git snapshot
---
 .gitignore                  |  1 +
 makesrc.sh                  | 28 ++++++++++++++++++++++++++++
 php-phpunit-php-timer2.spec | 17 +++++++++++------
 sources                     |  2 +-
 4 files changed, 41 insertions(+), 7 deletions(-)
 create mode 100755 makesrc.sh

diff --git a/.gitignore b/.gitignore
index 3f91d21..7118e2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /php-phpunit-php-timer2-2.1.1-8b389ae.tar.gz
 /php-phpunit-php-timer2-2.1.2-1038454.tar.gz
 /php-phpunit-php-timer2-2.1.3-2454ae1.tar.gz
+/php-phpunit-php-timer2-2.1.4-a691211.tgz
diff --git a/makesrc.sh b/makesrc.sh
new file mode 100755
index 0000000..3d8028d
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+NAME=$(basename $PWD)
+OWNER=$(sed   -n '/^%global gh_owner/{s/.* //;p}'  $NAME.spec)
+PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
+VERSION=$(sed -n '/^Version:/{s/.* //;p}'           $NAME.spec)
+COMMIT=$(sed  -n '/^%global gh_commit/{s/.* //;p}'  $NAME.spec)
+SHORT=${COMMIT:0:7}
+
+echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n"
+
+echo "Cloning..."
+rm -rf $PROJECT-$COMMIT
+git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
+
+echo "Getting commit..."
+pushd $PROJECT-$COMMIT
+git checkout $COMMIT
+cp composer.json ../composer.json
+popd
+
+echo "Archiving..."
+tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT
+
+echo "Cleaning..."
+rm -rf $PROJECT-$COMMIT
+
+echo "Done."
diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index c729dc6..f02f130 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-phpunit-php-timer2
 #
-# Copyright (c) 2010-2023 Christof Damian, Remi Collet
+# Copyright (c) 2010-2024 Christof Damian, Remi Collet
 #
 # License: MIT
 # http://opensource.org/licenses/MIT
@@ -8,7 +8,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    2454ae1765516d20c4ffe103d85a58a9a3bd5662
+%global gh_commit    a691211e94ff39a34811abd521c31bd5b305b0bb
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   php-timer
@@ -28,13 +28,14 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        2.1.3
-Release:        10%{?dist}
+Version:        2.1.4
+Release:        1%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD-3-Clause
 URL:            https://github.com/%{gh_owner}/%{gh_project}
-Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
+Source0:        %{name}-%{version}-%{gh_short}.tgz
+Source1:        makesrc.sh
 
 BuildArch:      noarch
 BuildRequires:  php(language) >= 7.2
@@ -84,7 +85,7 @@ touch vendor/autoload.php
 
 : Run upstream test suite
 ret=0
-for cmd in php php80 php81 php82; do
+for cmd in php php81 php82 php83; do
   if which $cmd; then
     $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php \
       %{_bindir}/phpunit8 --verbose || ret=1
@@ -103,6 +104,10 @@ exit $ret
 
 
 %changelog
+* Fri Mar  1 2024 Remi Collet <remi@remirepo.net> - 2.1.4-1
+- update to 2.1.4 (no change)
+- sources from git snapshot
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index 5071c43..dd2633f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-phpunit-php-timer2-2.1.3-2454ae1.tar.gz) = ee750b5d57eca9af8a327f50d557d16feae29c487dc6420caf2127e2e6b486010bab95e455bb9da7e487b5d9e2a7cd2d4d2aa19622429cc08d907e0263c2fdd4
+SHA512 (php-phpunit-php-timer2-2.1.4-a691211.tgz) = 0ea06d2db0eb91fe5a8bed06425b79ee43397b9c018a444a8aeaeadfdc721295aa2f525e6a3e67d9e53919073c9f91470a0cab1a43b2040b10e60a412e9b9250

From 2b3e67ccd51872a3d56e4db87232eba6db30be76 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jul 2024 07:21:11 +0000
Subject: [PATCH 23/25] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 php-phpunit-php-timer2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index f02f130..8713cf3 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -29,7 +29,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        2.1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD-3-Clause
@@ -104,6 +104,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Fri Mar  1 2024 Remi Collet <remi@remirepo.net> - 2.1.4-1
 - update to 2.1.4 (no change)
 - sources from git snapshot

From 11811abcca84070cc169545add520c217e9a13cf Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 18 Jan 2025 09:36:00 +0000
Subject: [PATCH 24/25] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 php-phpunit-php-timer2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index 8713cf3..69b0524 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -29,7 +29,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        2.1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD-3-Clause
@@ -104,6 +104,9 @@ exit $ret
 
 
 %changelog
+* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From 6c93a5611e7e385aa8bdf05ad6d6d43eaa384e14 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 05:28:31 +0000
Subject: [PATCH 25/25] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 php-phpunit-php-timer2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec
index 69b0524..c2d5d68 100644
--- a/php-phpunit-php-timer2.spec
+++ b/php-phpunit-php-timer2.spec
@@ -29,7 +29,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        2.1.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        PHP Utility class for timing
 
 License:        BSD-3-Clause
@@ -104,6 +104,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild