From 2b2639ca2d0b6a39ff71df9fe726c1b328e23609 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 29 Jun 2016 11:10:10 +0200 Subject: php-zendframework-zend-hydrator: 2.2.1 --- php-zendframework-zend-hydrator.spec | 40 +++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 12 deletions(-) (limited to 'php-zendframework-zend-hydrator.spec') diff --git a/php-zendframework-zend-hydrator.spec b/php-zendframework-zend-hydrator.spec index d902e64..1998716 100644 --- a/php-zendframework-zend-hydrator.spec +++ b/php-zendframework-zend-hydrator.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 22652e1661a5a10b3f564cf7824a2206cf5a4a65 +%global gh_commit 0ac0d3e569781f1895670b0c8d0dc7f25b8a3182 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-hydrator @@ -20,7 +20,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 1.1.0 +Version: 2.2.1 Release: 1%{?dist} Summary: Zend Framework %{library} component @@ -38,29 +38,30 @@ BuildRequires: php(language) >= 5.5 BuildRequires: php-date BuildRequires: php-reflection BuildRequires: php-spl +BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 3.0 # From composer, "require-dev": { -# "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", +# "zendframework/zend-eventmanager": "^3.0", # "zendframework/zend-inputfilter": "^2.6", # "zendframework/zend-serializer": "^2.6.1", # "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", # "zendframework/zend-filter": "^2.6", -# "phpunit/PHPUnit": "~4.0", -# "squizlabs/php_codesniffer": "^2.0@dev" +# "phpunit/phpunit": "^4.5", +# "squizlabs/php_codesniffer": "^2.3.1" BuildRequires: php-composer(%{gh_owner}/zend-eventmanager) >= 2.6.2 BuildRequires: php-composer(%{gh_owner}/zend-inputfilter) >= 2.5 BuildRequires: php-composer(%{gh_owner}/zend-serializer) >= 2.6.1 BuildRequires: php-composer(%{gh_owner}/zend-servicemanager) >= 2.7.5 BuildRequires: php-composer(%{gh_owner}/zend-filter) >= 2.6 -BuildRequires: php-composer(phpunit/phpunit) >= 4.0 +BuildRequires: php-composer(phpunit/phpunit) >= 4.5 # Autoloader BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 %endif # From composer, "require": { # "php": "^5.5 || ^7.0", -# "zendframework/zend-stdlib": "^2.7 || ^3.0" +# "zendframework/zend-stdlib": "^3.0" Requires: php(language) >= 5.5 -Requires: php-composer(%{gh_owner}/zend-stdlib) >= 2.7 +Requires: php-composer(%{gh_owner}/zend-stdlib) >= 3.0 Requires: php-composer(%{gh_owner}/zend-stdlib) < 4 # From composer, "suggest": { # "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage", @@ -122,11 +123,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 --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 +exit $ret %else : Test suite disabled %endif @@ -146,6 +158,10 @@ rm -rf %{buildroot} %changelog +* Wed Jun 29 2016 Remi Collet - 2.2.1-1 +- update to 2.2.1 for ZendFramework 3 +- raise dependency on zend-stdlib >= 3.0 + * Fri Feb 19 2016 Remi Collet - 1.1.0-1 - update to 1.1.0 - raise dependency on zend-stdlib >= 2.7 -- cgit