From 9980c882d163510cd04dbeeaeea7dba7862b8ea0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Dec 2017 10:58:17 +0100 Subject: clean --- .gitignore | 8 ++++++++ php-zendframework-zend-mvc-plugin-fileprg.spec | 27 +++++--------------------- 2 files changed, 13 insertions(+), 22 deletions(-) create mode 100644 .gitignore 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-mvc-plugin-fileprg.spec b/php-zendframework-zend-mvc-plugin-fileprg.spec index 15dc58c..0c707c6 100644 --- a/php-zendframework-zend-mvc-plugin-fileprg.spec +++ b/php-zendframework-zend-mvc-plugin-fileprg.spec @@ -30,7 +30,6 @@ URL: https://zendframework.github.io/%{gh_project}/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch # Tests %if %{with_tests} @@ -108,8 +107,6 @@ mv LICENSE.md LICENSE %install -rm -rf %{buildroot} - mkdir -p %{buildroot}%{php_home}/Zend/Mvc/Plugin cp -pr src %{buildroot}%{php_home}/Zend/Mvc/Plugin/%{library} @@ -129,33 +126,19 @@ Zend\Loader\AutoloaderFactory::factory(array( require_once '%{php_home}/Zend/autoload.php'; EOF -# remirepo:11 -run=0 ret=0 -if which php56; then - php56 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} || ret=1 - run=1 -fi -if which php71; then - php70 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} || ret=1 - run=1 -fi -if [ $run -eq 0 ]; then -%{_bindir}/phpunit --include-path=%{buildroot}%{php_home} --verbose -# remirepo:2 -fi +for cmd in php php56 php70 php71 php72; do + if which $cmd; then + $cmd %{_bindir}/phpunit || 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 -- cgit