diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | phpcov.spec | 21 |
2 files changed, 18 insertions, 5 deletions
diff --git a/composer.json b/composer.json index 23c7115..b905584 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "sebastian/diff": "^1.1 || ^2.0", "sebastian/finder-facade": "^1.1", "sebastian/version": "^2.0", - "symfony/console": "^3" + "symfony/console": "^3.0|^4.0" }, "autoload": { "classmap": [ diff --git a/phpcov.spec b/phpcov.spec index 44aa757..4423007 100644 --- a/phpcov.spec +++ b/phpcov.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 880a4264c927f7eb78fe42fab5ca4dc9c5ce2631 +%global gh_commit 522e81f50964c13d7ca621fdfff8accbf0f289e3 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpcov @@ -21,7 +21,7 @@ Name: %{pk_project} -Version: 4.0.2 +Version: 4.0.3 Release: 1%{?dist} Summary: CLI frontend for PHP_CodeCoverage @@ -46,7 +46,12 @@ BuildRequires: php-composer(sebastian/finder-facade) < 2 BuildRequires: php-composer(sebastian/finder-facade) >= 1.1 BuildRequires: php-composer(sebastian/version) < 3 BuildRequires: php-composer(sebastian/version) >= 2.0 +%if 0%{?fedora} >= 26 +BuildRequires: php-composer(symfony/console) < 5 +%else BuildRequires: php-composer(symfony/console) < 4 +%endif +# temporarily ignore min version BuildRequires: php-composer(symfony/console) >= 2.8 BuildRequires: php-pecl(Xdebug) %endif @@ -58,7 +63,7 @@ BuildRequires: php-pecl(Xdebug) # "sebastian/diff": "^1.1 || ^2.0", # "sebastian/finder-facade": "^1.1", # "sebastian/version": "^2.0", -# "symfony/console": "^3" +# "symfony/console": "^3.0|^4.0" Requires: php(language) >= 7.0 Requires: phpunit6 Requires: php-composer(phpunit/php-code-coverage) < 6 @@ -69,7 +74,11 @@ Requires: php-composer(sebastian/finder-facade) < 2 Requires: php-composer(sebastian/finder-facade) >= 1.1 Requires: php-composer(sebastian/version) < 3 Requires: php-composer(sebastian/version) >= 2.0 +%if 0%{?fedora} >= 26 +Requires: php-composer(symfony/console) < 5 +%else Requires: php-composer(symfony/console) < 4 +%endif # temporarily ignore min version Requires: php-composer(symfony/console) >= 2.8 # from phpcompatinfo report for version 4.0.0 @@ -109,6 +118,7 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/%{ns_vendor}/FinderFacade/autoload.php', '%{php_home}/%{ns_vendor}/Version/autoload.php', [ + '%{php_home}/Symfony4/Component/Console/autoload.php', '%{php_home}/Symfony3/Component/Console/autoload.php', '%{php_home}/Symfony/Component/Console/autoload.php', ] @@ -128,7 +138,6 @@ install -D -p -m 755 %{pk_project} %{buildroot}%{_bindir}/%{pk_project} mkdir vendor ln -s %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php vendor/autoload.php -# 7.2: XDebug not yet available for cmd in php php70 php71 php72; do if which $cmd; then $cmd %{_bindir}/phpunit6 --verbose @@ -149,6 +158,10 @@ done %changelog +* Sun Nov 19 2017 Remi Collet <remi@remirepo.net> - 4.0.3-1 +- Update to 4.0.3 +- Allow Symfony 4 + * Sun Oct 22 2017 Remi Collet <remi@remirepo.net> - 4.0.2-1 - Update to 4.0.2 - raise dependency on phpunit/php-code-coverage 5.2.1 |