diff --git a/.gitignore b/.gitignore index bcc34d5..e00403b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /phpcov-4.0.0-7deaf88.tar.gz /phpcov-4.0.1-8afb1e7.tar.gz /phpcov-4.0.2-880a426.tar.gz +/phpcov-4.0.3-522e81f.tar.gz diff --git a/phpcov.spec b/phpcov.spec index b86a5bf..8393423 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 - 4.0.3-1 +- Update to 4.0.3 +- Allow Symfony 4 + * Sun Oct 22 2017 Remi Collet - 4.0.2-1 - Update to 4.0.2 - raise dependency on phpunit/php-code-coverage 5.2.1 diff --git a/sources b/sources index b7cacc2..d51a75a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpcov-4.0.2-880a426.tar.gz) = 1ff5930a57b982b16175e3044458384f0460677f0682943a3cc994d9bc54733b7f9b3688879b9f7a4f774c172175398dd22e9090d2f186cfec16a1ac547a45bf +SHA512 (phpcov-4.0.3-522e81f.tar.gz) = 44cf5969e35f0e8464faa607020786dc38f7c7d1f0b2f7b91324ff284be29de7b9f7eea81280f44cba1a58e5565892eb93d0a692dff012be04ec21030941b437