From 54bfcc9b410d2918e93a55bc007f656297ec1dad Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 3 Nov 2017 10:20:15 +0100 Subject: v1.3.2 --- ...ndframework-zend-expressive-platesrenderer.spec | 30 ++++++++-------------- 1 file changed, 11 insertions(+), 19 deletions(-) (limited to 'php-zendframework-zend-expressive-platesrenderer.spec') diff --git a/php-zendframework-zend-expressive-platesrenderer.spec b/php-zendframework-zend-expressive-platesrenderer.spec index b5ef7be..4e7a5e5 100644 --- a/php-zendframework-zend-expressive-platesrenderer.spec +++ b/php-zendframework-zend-expressive-platesrenderer.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 15d8fe489495c039f1107d7a1f894fcf678f08e7 +%global gh_commit 2b11cb107737ae07332a83f2bb138b311e9fe5c1 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-expressive-platesrenderer @@ -21,7 +21,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 1.3.1 +Version: 1.3.2 Release: 1%{?dist} Summary: Plates integration for %{library} @@ -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} @@ -123,8 +122,6 @@ EOF %install -rm -rf %{buildroot} - mkdir -p %{buildroot}%{php_home}/Zend/%{library} cp -pr src %{buildroot}%{php_home}/Zend/%{library}/%{sublib} @@ -148,28 +145,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 --verbose || ret=1 -fi -if which php71; then - php71 %{_bindir}/phpunit6 --verbose || 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 @@ -179,6 +168,9 @@ rm -rf %{buildroot} %changelog +* Thu Nov 2 2017 Remi Collet - 1.3.2-1 +- Update to 1.3.2 + * Tue Mar 14 2017 Remi Collet - 1.3.1-1 - Update to 1.3.1 - use phpunit6 on F26+ -- cgit