From c348780413bf1a1134421088b472617a106ff404 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 10 Aug 2020 14:01:29 +0200 Subject: [PATCH 1/3] v3.1.0 (cherry picked from commit 91e6ad2fb5987584a152be6255fa59e87cba01d6) (cherry picked from commit dfaff5610ae6250893082cdd1efa783a8905c133) --- .gitignore | 1 + php-phpunit-php-invoker3.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2152b1f..0c24168 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /php-phpunit-php-invoker3-3.0.0-7579d5a.tar.gz /php-phpunit-php-invoker3-3.0.1-62f696a.tgz /php-phpunit-php-invoker3-3.0.2-f6eedfe.tgz +/php-phpunit-php-invoker3-3.1.0-7a85b66.tgz diff --git a/php-phpunit-php-invoker3.spec b/php-phpunit-php-invoker3.spec index 185baa9..0a0e986 100644 --- a/php-phpunit-php-invoker3.spec +++ b/php-phpunit-php-invoker3.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit f6eedfed1085dd1f4c599629459a0277d25f9a66 +%global gh_commit 7a85b66acc48cacffdf87dadd3694e7123674298 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-invoker @@ -27,7 +27,7 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.0.2 +Version: 3.1.0 Release: 1%{?dist} Summary: Invoke callables with a timeout @@ -108,6 +108,9 @@ exit $ret %changelog +* Mon Aug 10 2020 Remi Collet - 3.1.0-1 +- update to 3.1.0 + * Mon Jun 29 2020 Remi Collet - 3.0.2-1 - update to 3.0.2 diff --git a/sources b/sources index dc74317..3ecafef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-invoker3-3.0.2-f6eedfe.tgz) = 94eefc93807dd909cbe014f27535111f11bcbf5669e62eb756207dded00f2f366c3af41f55c8f0ef6fc70d819a1577b4dd04e36c5f6adaf2c76e389141396a06 +SHA512 (php-phpunit-php-invoker3-3.1.0-7a85b66.tgz) = 5fb2c57add749dd75e407d0bdb59df25cf8f10620192a1b2a86bf7ad37063433301d876f178fd37c1c3ebfc4724e72ab37644e9ebe9f9dcf82c34ed82d2b96f7 From 58a174ba83809f1ddee668a70c88a13e74901ae6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 28 Sep 2020 09:35:58 +0200 Subject: [PATCH 2/3] update to 3.1.1 (no change) --- .gitignore | 1 + php-phpunit-php-invoker3.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 0c24168..ecc4460 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /php-phpunit-php-invoker3-3.0.1-62f696a.tgz /php-phpunit-php-invoker3-3.0.2-f6eedfe.tgz /php-phpunit-php-invoker3-3.1.0-7a85b66.tgz +/php-phpunit-php-invoker3-3.1.1-5a10147.tgz diff --git a/php-phpunit-php-invoker3.spec b/php-phpunit-php-invoker3.spec index 0a0e986..89aa8b1 100644 --- a/php-phpunit-php-invoker3.spec +++ b/php-phpunit-php-invoker3.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 7a85b66acc48cacffdf87dadd3694e7123674298 +%global gh_commit 5a10147d0aaf65b58940a0b72f71c9ac0423cc67 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-invoker @@ -27,7 +27,7 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.1.0 +Version: 3.1.1 Release: 1%{?dist} Summary: Invoke callables with a timeout @@ -42,13 +42,13 @@ BuildRequires: php-fedora-autoloader-devel %if %{with tests} # From composer.json, require-dev # "ext-pcntl": "*" -# "phpunit/phpunit": "^9.0" +# "phpunit/phpunit": "^9.3" BuildRequires: php-pcntl -BuildRequires: phpunit9 +BuildRequires: phpunit9 >= 9.3 %endif # From composer.json, require -# "php": "^7.3 || ^8.0", +# "php": ">=7.3", Requires: php(language) >= 7.3 # From phpcompatinfo report for version 3.0.0 Requires: php-pcntl @@ -108,6 +108,9 @@ exit $ret %changelog +* Mon Sep 28 2020 Remi Collet - 3.1.1-1 +- update to 3.1.1 (no change) + * Mon Aug 10 2020 Remi Collet - 3.1.0-1 - update to 3.1.0 diff --git a/sources b/sources index 3ecafef..38123dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-invoker3-3.1.0-7a85b66.tgz) = 5fb2c57add749dd75e407d0bdb59df25cf8f10620192a1b2a86bf7ad37063433301d876f178fd37c1c3ebfc4724e72ab37644e9ebe9f9dcf82c34ed82d2b96f7 +SHA512 (php-phpunit-php-invoker3-3.1.1-5a10147.tgz) = f46d75a0b39d469516b857a3fcba8833ac6eb5942d7d4c2e4420d32f2768e623326f586558d81a763fe5420cd1ea734adc0dafa8341337585d8c54d27365a876 From e280a74ccf6f274be0a5724e256bbfd308b6b245 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 28 Sep 2020 09:36:47 +0200 Subject: [PATCH 3/3] Revert "update to 3.1.1 (no change)" This reverts commit 58a174ba83809f1ddee668a70c88a13e74901ae6. --- .gitignore | 1 - php-phpunit-php-invoker3.spec | 13 +++++-------- sources | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index ecc4460..0c24168 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ /php-phpunit-php-invoker3-3.0.1-62f696a.tgz /php-phpunit-php-invoker3-3.0.2-f6eedfe.tgz /php-phpunit-php-invoker3-3.1.0-7a85b66.tgz -/php-phpunit-php-invoker3-3.1.1-5a10147.tgz diff --git a/php-phpunit-php-invoker3.spec b/php-phpunit-php-invoker3.spec index 89aa8b1..0a0e986 100644 --- a/php-phpunit-php-invoker3.spec +++ b/php-phpunit-php-invoker3.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 5a10147d0aaf65b58940a0b72f71c9ac0423cc67 +%global gh_commit 7a85b66acc48cacffdf87dadd3694e7123674298 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-invoker @@ -27,7 +27,7 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.1.1 +Version: 3.1.0 Release: 1%{?dist} Summary: Invoke callables with a timeout @@ -42,13 +42,13 @@ BuildRequires: php-fedora-autoloader-devel %if %{with tests} # From composer.json, require-dev # "ext-pcntl": "*" -# "phpunit/phpunit": "^9.3" +# "phpunit/phpunit": "^9.0" BuildRequires: php-pcntl -BuildRequires: phpunit9 >= 9.3 +BuildRequires: phpunit9 %endif # From composer.json, require -# "php": ">=7.3", +# "php": "^7.3 || ^8.0", Requires: php(language) >= 7.3 # From phpcompatinfo report for version 3.0.0 Requires: php-pcntl @@ -108,9 +108,6 @@ exit $ret %changelog -* Mon Sep 28 2020 Remi Collet - 3.1.1-1 -- update to 3.1.1 (no change) - * Mon Aug 10 2020 Remi Collet - 3.1.0-1 - update to 3.1.0 diff --git a/sources b/sources index 38123dc..3ecafef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-invoker3-3.1.1-5a10147.tgz) = f46d75a0b39d469516b857a3fcba8833ac6eb5942d7d4c2e4420d32f2768e623326f586558d81a763fe5420cd1ea734adc0dafa8341337585d8c54d27365a876 +SHA512 (php-phpunit-php-invoker3-3.1.0-7a85b66.tgz) = 5fb2c57add749dd75e407d0bdb59df25cf8f10620192a1b2a86bf7ad37063433301d876f178fd37c1c3ebfc4724e72ab37644e9ebe9f9dcf82c34ed82d2b96f7