diff --git a/phpcov.spec b/phpcov.spec index dc112c0..16c9db5 100644 --- a/phpcov.spec +++ b/phpcov.spec @@ -22,7 +22,7 @@ Name: %{pk_project} Version: 4.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: CLI frontend for PHP_CodeCoverage Group: Development/Libraries @@ -46,6 +46,7 @@ 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 +BuildRequires: php-composer(symfony/console) < 4 BuildRequires: php-composer(symfony/console) >= 2.8 BuildRequires: php-pecl(Xdebug) %endif @@ -80,7 +81,7 @@ Provides: php-phpunit-phpcov = %{version} %else Conflicts: php-phpunit-phpcov < 4 %endif -Provides: php-composer(%{pk_vendoir}/%{pk_project}) = %{version} +Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version} %description @@ -92,6 +93,9 @@ Provides: php-composer(%{pk_vendoir}/%{pk_project}) = %{version} %patch0 -p0 -b .rpm +# https://github.com/sebastianbergmann/phpcov/pull/61 +chmod -x composer.json + %build phpab \ @@ -127,7 +131,11 @@ 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 -%{_bindir}/phpunit6 --verbose +for cmd in php php70 php71; do + if which $cmd; then + $cmd %{_bindir}/phpunit6 --verbose + fi +done %else : Test suite skipped %endif @@ -143,6 +151,10 @@ ln -s %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php vendor/aut %changelog +* Mon Apr 24 2017 Remi Collet - 4.0.0-2 +- fix composer provide (from review #1420384) +- fix composer.json perm + * Wed Feb 8 2017 Remi Collet - 4.0.0-1 - rename to phpcov - update to 4.0.0