From 215def25240bf07fc4ff97944547100bab3d82ce Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Nov 2016 10:11:59 +0100 Subject: php-zendframework-zend-math: dup the spec --- php-zendframework-zend-validator.spec | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/php-zendframework-zend-validator.spec b/php-zendframework-zend-validator.spec index 37c0df3..9ded52e 100644 --- a/php-zendframework-zend-validator.spec +++ b/php-zendframework-zend-validator.spec @@ -21,7 +21,7 @@ Name: php-%{gh_owner}-%{gh_project} Version: 2.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -30,6 +30,9 @@ URL: https://framework.zend.com/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh +# https://github.com/zendframework/zend-validator/pull/136 +Patch0: %{name}-pr136.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch # Tests @@ -126,6 +129,7 @@ Documentation: https://zendframework.github.io/%{gh_project}/ %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p1 mv LICENSE.md LICENSE @@ -156,11 +160,22 @@ Zend\Loader\AutoloaderFactory::factory(array( require_once '%{php_home}/Zend/autoload.php'; EOF -%{_bindir}/phpunit --include-path=%{buildroot}%{php_home} - -if which php70; then - php70 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} +# remirepo:11 +run=0 +ret=0 +if which php56; then + php56 %{_bindir}/phpunit || ret=1 + run=1 +fi +if which php71; then + php71 %{_bindir}/phpunit || ret=1 + run=1 fi +if [ $run -eq 0 ]; then +%{_bindir}/phpunit --verbose +# remirepo:2 +fi +exit $ret %else : Test suite disabled %endif @@ -180,6 +195,10 @@ rm -rf %{buildroot} %changelog +* Tue Nov 15 2016 Remi Collet - 2.8.1-2 +- add patch for PHP 7.1 and timezone changes +- open https://github.com/zendframework/zend-validator/pull/136 + * Thu Jun 23 2016 Remi Collet - 2.8.1-1 - Update to 2.8.1 -- cgit