diff options
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | php-zendframework-zend-expressive-zendviewrenderer.spec | 23 |
2 files changed, 14 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fc9aa8c --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +clog +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/php-zendframework-zend-expressive-zendviewrenderer.spec b/php-zendframework-zend-expressive-zendviewrenderer.spec index a36be2a..6954f4a 100644 --- a/php-zendframework-zend-expressive-zendviewrenderer.spec +++ b/php-zendframework-zend-expressive-zendviewrenderer.spec @@ -31,7 +31,6 @@ URL: https://zendframework.github.io/zend-expressive/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch # Tests %if %{with_tests} @@ -121,8 +120,6 @@ mv LICENSE.md LICENSE %install -rm -rf %{buildroot} - mkdir -p %{buildroot}%{php_home}/Zend/%{library} cp -pr src %{buildroot}%{php_home}/Zend/%{library}/%{sublib} @@ -144,28 +141,20 @@ Zend\Loader\AutoloaderFactory::factory(array( require_once '%{php_home}/Zend/autoload.php'; EOF -# remirepo:7 ret=0 -if which php56; then - php56 %{_bindir}/phpunit || ret=1 -fi -if which php71; then - php71 %{_bindir}/phpunit6 || ret=1 -fi -%{phpunit} --verbose -# remirepo:1 +for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1 + fi +done exit $ret %else : Test suite disabled %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md |