diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-phpunit-PHPUnit.spec | 75 |
2 files changed, 67 insertions, 10 deletions
diff --git a/composer.json b/composer.json index 54d8ee5..53bd8bb 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ "sebastian/global-state": "^1.1", "sebastian/object-enumerator": "~2.0", "sebastian/resource-operations": "~1.0", - "sebastian/version": "~1.0.3|~2.0", + "sebastian/version": "^1.0.6|^2.0.1", "myclabs/deep-copy": "~1.3", "ext-dom": "*", "ext-json": "*", diff --git a/php-phpunit-PHPUnit.spec b/php-phpunit-PHPUnit.spec index f59d7c3..ac939e2 100644 --- a/php-phpunit-PHPUnit.spec +++ b/php-phpunit-PHPUnit.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-phpunit-PHPUnit # -# Copyright (c) 2010-2017 Remi Collet +# Copyright (c) 2010-2018 Remi Collet # Copyright (c) 2006-2009 Christopher Stone # # License: MIT @@ -8,7 +8,11 @@ # # Please, preserve the changelog entries # -%global gh_commit 7fbc25c13309de0c4c9bb48b7361f1eca34c7fbd + +# For compatibility with SCL +%undefine __brp_mangle_shebangs + +%global gh_commit b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -17,7 +21,7 @@ %global pear_name PHPUnit %global pear_channel pear.phpunit.de %global major 5.7 -%global minor 26 +%global minor 27 %global specrel 1 Name: php-phpunit-PHPUnit @@ -45,6 +49,26 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php(language) >= 5.6 BuildRequires: %{_bindir}/phpab +%if 0%{?fedora} >= 27 +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 1.4 with php-composer(phpunit/php-file-iterator) < 2) +BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2 with php-composer(phpunit/php-text-template) < 2) +BuildRequires: (php-composer(phpunit/php-code-coverage) >= 4.0.4 with php-composer(phpunit/php-code-coverage) < 5) +BuildRequires: (php-composer(phpunit/php-timer) >= 1.0.6 with php-composer(phpunit/php-timer) < 2) +BuildRequires: (php-composer(phpunit/phpunit-mock-objects) >= 3.2 with php-composer(phpunit/phpunit-mock-objects) < 4) +BuildRequires: (php-composer(phpspec/prophecy) >= 1.6.2 with php-composer(phpspec/prophecy) < 2) +BuildRequires: (php-composer(sebastian/comparator) >= 1.2.4 with php-composer(sebastian/comparator) < 2) +BuildRequires: (php-composer(sebastian/diff) >= 1.4.3 with php-composer(sebastian/diff) < 2) +BuildRequires: (php-composer(sebastian/environment) >= 1.3.4 with php-composer(sebastian/environment) < 3) +BuildRequires: (php-composer(sebastian/exporter) >= 2.0 with php-composer(sebastian/exporter) < 3) +BuildRequires: (php-composer(sebastian/global-state) >= 1.1 with php-composer(sebastian/global-state) < 2) +BuildRequires: (php-composer(sebastian/object-enumerator) >= 2.0 with php-composer(sebastian/object-enumerator) < 3) +BuildRequires: (php-composer(sebastian/resource-operations) >= 1.0 with php-composer(sebastian/resource-operations) < 2) +BuildRequires: (php-composer(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3) +BuildRequires: (php-composer(myclabs/deep-copy) >= 1.3 with php-composer(myclabs/deep-copy) < 2) +BuildRequires: (php-composer(phpunit/php-invoker) >= 1.1 with php-composer(phpunit/php-invoker) < 2) +BuildRequires: (php-composer(doctrine/instantiator) >= 1.0.4 with php-composer(doctrine/instantiator) < 2) +BuildRequires: (php-composer(sebastian/recursion-context) >= 2.0 with php-composer(sebastian/recursion-context) < 3) +%else BuildRequires: php-composer(phpunit/php-file-iterator) < 2 BuildRequires: php-composer(phpunit/php-file-iterator) >= 1.4 BuildRequires: php-composer(phpunit/php-text-template) < 2 @@ -72,12 +96,15 @@ BuildRequires: php-composer(sebastian/object-enumerator) >= 2.0 BuildRequires: php-composer(sebastian/resource-operations) < 2 BuildRequires: php-composer(sebastian/resource-operations) >= 1.0 BuildRequires: php-composer(sebastian/version) < 3 -BuildRequires: php-composer(sebastian/version) >= 1.0.3 +BuildRequires: php-composer(sebastian/version) >= 2.0.1 BuildRequires: php-composer(myclabs/deep-copy) < 2 BuildRequires: php-composer(myclabs/deep-copy) >= 1.3 BuildRequires: php-symfony-yaml +BuildRequires: php-composer(phpunit/php-invoker) < 2 BuildRequires: php-composer(phpunit/php-invoker) >= 1.1.0 +BuildRequires: php-composer(doctrine/instantiator) < 2 BuildRequires: php-composer(doctrine/instantiator) >= 1.0.4 +%endif # Autoloader BuildRequires: php-composer(fedora/autoloader) @@ -97,7 +124,7 @@ BuildRequires: php-composer(fedora/autoloader) # "sebastian/global-state": "^1.1", # "sebastian/object-enumerator": "~2.0", # "sebastian/resource-operations": "~1.0", -# "sebastian/version": "~1.0.3|~2.0", +# "sebastian/version": "^1.0.6|^2.0.1", # "myclabs/deep-copy": "~1.3", # "ext-dom": "*", # "ext-json": "*", @@ -106,6 +133,23 @@ BuildRequires: php-composer(fedora/autoloader) # "ext-libxml": "*" Requires: php(language) >= 5.6 Requires: php-cli +%if 0%{?fedora} >= 27 +Requires: (php-composer(phpunit/php-file-iterator) >= 1.4 with php-composer(phpunit/php-file-iterator) < 2) +Requires: (php-composer(phpunit/php-text-template) >= 1.2 with php-composer(phpunit/php-text-template) < 2) +Requires: (php-composer(phpunit/php-code-coverage) >= 4.0.4 with php-composer(phpunit/php-code-coverage) < 5) +Requires: (php-composer(phpunit/php-timer) >= 1.0.6 with php-composer(phpunit/php-timer) < 2) +Requires: (php-composer(phpunit/phpunit-mock-objects) >= 3.2 with php-composer(phpunit/phpunit-mock-objects) < 4) +Requires: (php-composer(phpspec/prophecy) >= 1.6.2 with php-composer(phpspec/prophecy) < 2) +Requires: (php-composer(sebastian/comparator) >= 1.2.4 with php-composer(sebastian/comparator) < 2) +Requires: (php-composer(sebastian/diff) >= 1.4.3 with php-composer(sebastian/diff) < 2) +Requires: (php-composer(sebastian/environment) >= 1.3.4 with php-composer(sebastian/environment) < 3) +Requires: (php-composer(sebastian/exporter) >= 2.0 with php-composer(sebastian/exporter) < 3) +Requires: (php-composer(sebastian/global-state) >= 1.1 with php-composer(sebastian/global-state) < 2) +Requires: (php-composer(sebastian/object-enumerator) >= 2.0 with php-composer(sebastian/object-enumerator) < 3) +Requires: (php-composer(sebastian/resource-operations) >= 1.0 with php-composer(sebastian/resource-operations) < 2) +Requires: (php-composer(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3) +Requires: (php-composer(myclabs/deep-copy) >= 1.3 with php-composer(myclabs/deep-copy) < 2) +%else Requires: php-composer(phpunit/php-file-iterator) < 2 Requires: php-composer(phpunit/php-file-iterator) >= 1.4 Requires: php-composer(phpunit/php-text-template) < 2 @@ -133,9 +177,10 @@ Requires: php-composer(sebastian/object-enumerator) >= 2.0 Requires: php-composer(sebastian/resource-operations) < 2 Requires: php-composer(sebastian/resource-operations) >= 1.0 Requires: php-composer(sebastian/version) < 3 -Requires: php-composer(sebastian/version) >= 1.0.3 +Requires: php-composer(sebastian/version) >= 2.0.1 Requires: php-composer(myclabs/deep-copy) < 2 Requires: php-composer(myclabs/deep-copy) >= 1.3 +%endif Requires: php-symfony-yaml Requires: php-dom Requires: php-json @@ -145,14 +190,20 @@ Requires: php-libxml # From composer.json, "suggest": { # "phpunit/php-invoker": "~1.1", # "ext-xdebug": "*" +%if 0%{?fedora} >= 27 +Requires: (php-composer(phpunit/php-invoker) >= 1.1 with php-composer(phpunit/php-invoker) < 2) +# For our autoload patch +Requires: (php-composer(doctrine/instantiator) >= 1.0.4 with php-composer(doctrine/instantiator) < 2) +Requires: (php-composer(sebastian/recursion-context) >= 2.0 with php-composer(sebastian/recursion-context) < 3) +%else Requires: php-composer(phpunit/php-invoker) < 2 Requires: php-composer(phpunit/php-invoker) >= 1.1 -# For our autoload patch Requires: php-composer(doctrine/instantiator) < 2 Requires: php-composer(doctrine/instantiator) >= 1.0.4 -Requires: php-composer(fedora/autoloader) Requires: php-composer(sebastian/recursion-context) < 3 Requires: php-composer(sebastian/recursion-context) >= 2.0 +%endif +Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 5.6.0 Requires: php-reflection Requires: php-openssl @@ -214,7 +265,7 @@ install -D -p -m 755 phpunit %{buildroot}%{_bindir}/phpunit OPT="--testsuite=small --no-coverage" ret=0 -for cmd in php56 php70 php71 php; do +for cmd in php70 php71 php; do if which $cmd; then $cmd ./phpunit $OPT --verbose fi @@ -244,6 +295,12 @@ fi %changelog +* Thu Feb 1 2018 Remi Collet <remi@remirepo.net> - 5.7.27-1 +- Update to 5.7.27 +- raise dependency on sebastian/version 2.0.1 +- undefine __brp_mangle_shebangs +- use range dependencies on F27+ + * Mon Dec 18 2017 Remi Collet <remi@remirepo.net> - 5.7.26-1 - Update to 5.7.26 |