From 38da4588460f4ca23753562b9a44df219ab11dd4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 31 Mar 2020 11:41:02 +0200 Subject: update to 9.0.2 own /usr/share/php/PHPUnit9/Extensions raise dependency on phpunit/php-code-coverage 8.0.1 raise dependency on sebastian/environment 5.0.1 --- composer.json | 4 ++-- phpunit9.spec | 58 +++++++++++++++++++++++++++++++++++----------------------- 2 files changed, 37 insertions(+), 25 deletions(-) diff --git a/composer.json b/composer.json index 4c7ed7b..3c736ee 100644 --- a/composer.json +++ b/composer.json @@ -33,14 +33,14 @@ "phar-io/manifest": "^1.0.3", "phar-io/version": "^2.0.1", "phpspec/prophecy": "^1.8.1", - "phpunit/php-code-coverage": "^8.0", + "phpunit/php-code-coverage": "^8.0.1", "phpunit/php-file-iterator": "^3.0", "phpunit/php-invoker": "^3.0", "phpunit/php-text-template": "^2.0", "phpunit/php-timer": "^3.0", "sebastian/comparator": "^4.0", "sebastian/diff": "^4.0", - "sebastian/environment": "^5.0", + "sebastian/environment": "^5.0.1", "sebastian/exporter": "^4.0", "sebastian/global-state": "^4.0", "sebastian/object-enumerator": "^4.0", diff --git a/phpunit9.spec b/phpunit9.spec index b6e0661..a2e477c 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 68d7e5b17a6b9461e17c00446caa409863154f76 +%global gh_commit c0ecbfb898ab8b24d8a59a23520f7b2a73e27b5b #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -24,7 +24,7 @@ %global php_home %{_datadir}/php %global ver_major 9 %global ver_minor 0 -%global ver_patch 1 +%global ver_patch 2 %global specrel 1 Name: %{pk_project}%{ver_major} @@ -48,14 +48,14 @@ BuildRequires: (php-composer(myclabs/deep-copy) >= 1.9.1 with php-c BuildRequires: (php-composer(phar-io/manifest) >= 1.0.3 with php-composer(phar-io/manifest) < 2) BuildRequires: (php-composer(phar-io/version) >= 2.0.1 with php-composer(phar-io/version) < 3) BuildRequires: (php-composer(phpspec/prophecy) >= 1.8.1 with php-composer(phpspec/prophecy) < 2) -BuildRequires: (php-composer(phpunit/php-code-coverage) >= 8.0 with php-composer(phpunit/php-code-coverage) < 9) +BuildRequires: (php-composer(phpunit/php-code-coverage) >= 8.0.1 with php-composer(phpunit/php-code-coverage) < 9) BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-composer(phpunit/php-file-iterator) < 4) BuildRequires: (php-composer(phpunit/php-invoker) >= 3.0 with php-composer(phpunit/php-invoker) < 4) BuildRequires: (php-composer(phpunit/php-text-template) >= 2.0 with php-composer(phpunit/php-text-template) < 3) BuildRequires: (php-composer(phpunit/php-timer) >= 3.0 with php-composer(phpunit/php-timer) < 4) BuildRequires: (php-composer(sebastian/comparator) >= 4.0 with php-composer(sebastian/comparator) < 5) BuildRequires: (php-composer(sebastian/diff) >= 4.0 with php-composer(sebastian/diff) < 5) -BuildRequires: (php-composer(sebastian/environment) >= 5.0 with php-composer(sebastian/environment) < 6) +BuildRequires: (php-composer(sebastian/environment) >= 5.0.1 with php-composer(sebastian/environment) < 6) BuildRequires: (php-composer(sebastian/exporter) >= 4.0 with php-composer(sebastian/exporter) < 5) BuildRequires: (php-composer(sebastian/global-state) >= 4.0 with php-composer(sebastian/global-state) < 5) BuildRequires: (php-composer(sebastian/object-enumerator) >= 4.0 with php-composer(sebastian/object-enumerator) < 5) @@ -69,14 +69,14 @@ BuildRequires: php-myclabs-deep-copy19 >= 1.9.1 BuildRequires: php-phar-io-manifest >= 1.0.3 BuildRequires: php-phar-io-version >= 2.0.1 BuildRequires: php-phpspec-prophecy >= 1.8.1 -BuildRequires: php-phpunit-php-code-coverage8 +BuildRequires: php-phpunit-php-code-coverage8 >= 8.0.1 BuildRequires: php-phpunit-php-file-iterator3 BuildRequires: php-phpunit-php-invoker3 BuildRequires: php-phpunit-php-text-template2 BuildRequires: php-phpunit-php-timer3 BuildRequires: php-sebastian-comparator4 BuildRequires: php-sebastian-diff4 -BuildRequires: php-sebastian-environment5 +BuildRequires: php-sebastian-environment5 >= 5.0.1 BuildRequires: php-sebastian-exporter4 BuildRequires: php-sebastian-global-state4 BuildRequires: php-sebastian-object-enumerator4 @@ -106,19 +106,20 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "phar-io/manifest": "^1.0.3", # "phar-io/version": "^2.0.1", # "phpspec/prophecy": "^1.8.1", -# "phpunit/php-code-coverage": "^7.0.7", -# "phpunit/php-file-iterator": "^2.0.2", -# "phpunit/php-text-template": "^1.2.1", -# "phpunit/php-timer": "^2.1.2", -# "sebastian/comparator": "^3.0.2", -# "sebastian/diff": "^3.0.2", -# "sebastian/environment": "^4.2.2", -# "sebastian/exporter": "^3.1.1", -# "sebastian/global-state": "^3.0.0", -# "sebastian/object-enumerator": "^3.0.3", -# "sebastian/resource-operations": "^2.0.1", -# "sebastian/type": "^1.1.3", -# "sebastian/version": "^2.0.1", +# "phpunit/php-code-coverage": "^8.0.1", +# "phpunit/php-file-iterator": "^3.0", +# "phpunit/php-invoker": "^3.0", +# "phpunit/php-text-template": "^2.0", +# "phpunit/php-timer": "^3.0", +# "sebastian/comparator": "^4.0", +# "sebastian/diff": "^4.0", +# "sebastian/environment": "^5.0.1", +# "sebastian/exporter": "^4.0", +# "sebastian/global-state": "^4.0", +# "sebastian/object-enumerator": "^4.0", +# "sebastian/resource-operations": "^3.0", +# "sebastian/type": "^2.0", +# "sebastian/version": "^3.0" Requires: php(language) >= 7.3 Requires: php-cli Requires: php-dom @@ -134,14 +135,14 @@ Requires: (php-composer(myclabs/deep-copy) >= 1.9.1 with php-c Requires: (php-composer(phar-io/manifest) >= 1.0.3 with php-composer(phar-io/manifest) < 2) Requires: (php-composer(phar-io/version) >= 2.0.1 with php-composer(phar-io/version) < 3) Requires: (php-composer(phpspec/prophecy) >= 1.8.1 with php-composer(phpspec/prophecy) < 2) -Requires: (php-composer(phpunit/php-code-coverage) >= 8.0 with php-composer(phpunit/php-code-coverage) < 9) +Requires: (php-composer(phpunit/php-code-coverage) >= 8.0.1 with php-composer(phpunit/php-code-coverage) < 9) Requires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-composer(phpunit/php-file-iterator) < 4) Requires: (php-composer(phpunit/php-invoker) >= 3.0 with php-composer(phpunit/php-invoker) < 4) Requires: (php-composer(phpunit/php-text-template) >= 2.0 with php-composer(phpunit/php-text-template) < 3) Requires: (php-composer(phpunit/php-timer) >= 3.0 with php-composer(phpunit/php-timer) < 4) Requires: (php-composer(sebastian/comparator) >= 4.0 with php-composer(sebastian/comparator) < 5) Requires: (php-composer(sebastian/diff) >= 4.0 with php-composer(sebastian/diff) < 5) -Requires: (php-composer(sebastian/environment) >= 5.0 with php-composer(sebastian/environment) < 6) +Requires: (php-composer(sebastian/environment) >= 5.0.1 with php-composer(sebastian/environment) < 6) Requires: (php-composer(sebastian/exporter) >= 4.0 with php-composer(sebastian/exporter) < 5) Requires: (php-composer(sebastian/global-state) >= 4.0 with php-composer(sebastian/global-state) < 5) Requires: (php-composer(sebastian/object-enumerator) >= 4.0 with php-composer(sebastian/object-enumerator) < 5) @@ -160,14 +161,14 @@ Requires: php-myclabs-deep-copy19 >= 1.9.1 Requires: php-phar-io-manifest >= 1.0.3 Requires: php-phar-io-version >= 2.0.1 Requires: php-phpspec-prophecy >= 1.8.1 -Requires: php-phpunit-php-code-coverage8 +Requires: php-phpunit-php-code-coverage8 >= 8.0.1 Requires: php-phpunit-php-file-iterator3 Requires: php-phpunit-php-invoker3 Requires: php-phpunit-php-text-template2 Requires: php-phpunit-php-timer3 Requires: php-sebastian-comparator4 Requires: php-sebastian-diff4 -Requires: php-sebastian-environment5 +Requires: php-sebastian-environment5 >= 5.0.1 Requires: php-sebastian-exporter4 Requires: php-sebastian-global-state4 Requires: php-sebastian-object-enumerator4 @@ -239,6 +240,10 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/PharIo/Version/autoload.php', __DIR__ . '/Framework/Assert/Functions.php', ]); +// Extensions +\Fedora\Autoloader\Dependencies::optional( + glob("%{php_home}/%{ns_vendor}/Extensions/*/autoload.php") +); EOF cat src/autoload.php @@ -254,6 +259,7 @@ cat src/autoload.php %install mkdir -p %{buildroot}%{php_home} cp -pr src %{buildroot}%{php_home}/%{ns_vendor} +mkdir %{buildroot}%{php_home}/%{ns_vendor}/Extensions install -D -p -m 755 phpunit %{buildroot}%{_bindir}/%{name} install -p -m 644 phpunit.xsd %{buildroot}%{php_home}/%{ns_vendor}/phpunit.xsd @@ -284,6 +290,12 @@ exit $ret %changelog +* Tue Mar 31 2020 Remi Collet - 9.0.2-1 +- update to 9.0.2 +- own /usr/share/php/PHPUnit9/Extensions +- raise dependency on phpunit/php-code-coverage 8.0.1 +- raise dependency on sebastian/environment 5.0.1 + * Fri Feb 14 2020 Remi Collet - 9.0.1-1 - update to 9.0.1 -- cgit