From 93b926bd2b7ebf2413856984cc2d79c39f37bc7d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 Feb 2016 07:07:39 +0100 Subject: php-zendframework-zend-di: 2.6.0 --- php-zendframework-zend-di.spec | 64 +++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/php-zendframework-zend-di.spec b/php-zendframework-zend-di.spec index 7b5ebec..e4ffd37 100644 --- a/php-zendframework-zend-di.spec +++ b/php-zendframework-zend-di.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 530b5c992d35b96ccd13d05ae460ce3301c3a6ad +%global gh_commit c271c25c3e0ce194cbfbf05c9e56444d9f98456e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-di @@ -20,7 +20,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.5.1 +Version: 2.6.0 Release: 1%{?dist} Summary: Zend Framework %{library} component @@ -38,42 +38,30 @@ BuildRequires: php(language) >= 5.3.23 BuildRequires: php-reflection BuildRequires: php-pcre BuildRequires: php-spl -BuildRequires: php-composer(%{gh_owner}/zend-code) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 2.5 +BuildRequires: php-composer(container-interop/container-interop) >= 1.1 +BuildRequires: php-composer(%{gh_owner}/zend-code) >= 2.6 +BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 2.7 # From composer, "require-dev": { -# "zendframework/zend-config": "~2.5", -# "zendframework/zend-db": "~2.5", -# "zendframework/zend-filter": "~2.5", -# "zendframework/zend-form": "~2.5", -# "zendframework/zend-log": "~2.5", -# "zendframework/zend-mvc": "~2.5", -# "zendframework/zend-servicemanager": "~2.5", -# "zendframework/zend-view": "~2.5", # "fabpot/php-cs-fixer": "1.7.*", # "phpunit/PHPUnit": "~4.0" -BuildRequires: php-composer(%{gh_owner}/zend-config) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-db) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-filter) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-form) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-log) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-mvc) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-servicemanager) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-view) >= 2.5 -BuildRequires: php-composer(phpunit/phpunit) >= 4.0 +BuildRequires: php-composer(phpunit/phpunit) >= 4.0 # Autoloader -BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 +BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 %endif # From composer, "require": { -# "php": ">=5.3.23", -# "zendframework/zend-code": "~2.5", -# "zendframework/zend-stdlib": "~2.5" +# "php": "^5.5 || ^7.0", +# "container-interop/container-interop": "^1.1", +# "zendframework/zend-code": "^2.6 || ^3.0", +# "zendframework/zend-stdlib": "^2.7 || ^3.0" Requires: php(language) >= 5.3.23 %if ! %{bootstrap} -Requires: php-composer(%{gh_owner}/zend-code) >= 2.5 -Requires: php-composer(%{gh_owner}/zend-code) < 3 -Requires: php-composer(%{gh_owner}/zend-stdlib) >= 2.5 -Requires: php-composer(%{gh_owner}/zend-stdlib) < 3 +Requires: php-composer(container-interop/container-interop) >= 1.1 +Requires: php-composer(container-interop/container-interop) < 2 +Requires: php-composer(%{gh_owner}/zend-code) >= 2.6 +Requires: php-composer(%{gh_owner}/zend-code) < 4 +Requires: php-composer(%{gh_owner}/zend-stdlib) >= 2.7 +Requires: php-composer(%{gh_owner}/zend-stdlib) < 4 # From composer, "suggest": { # "zendframework/zend-servicemanager": "Zend\\ServiceManager component" %if 0%{?fedora} >= 21 @@ -115,14 +103,14 @@ cp -pr src %{buildroot}%{php_home}/Zend/%{library} %check %if %{with_tests} mkdir vendor -cat << EOF | tee vendor/autoload.php +cat << 'EOF' | tee vendor/autoload.php array( +Zend\Loader\AutoloaderFactory::factory(array( + 'Zend\Loader\StandardAutoloader' => array( 'namespaces' => array( - 'ZendTest\\\\%{library}' => dirname(__DIR__).'/test/', - 'Zend\\\\%{library}' => '%{buildroot}%{php_home}/Zend/%{library}' + 'ZendTest\\%{library}' => dirname(__DIR__).'/test/', + 'Zend\\%{library}' => '%{buildroot}%{php_home}/Zend/%{library}' )))); require_once '%{php_home}/Zend/autoload.php'; EOF @@ -151,5 +139,11 @@ rm -rf %{buildroot} %changelog +* Wed Feb 24 2016 Remi Collet - 2.6.0-1 +- update to 2.6.0 +- add dependency on container-interop/container-interop +- raise dependency on zend-code >= 2.6 +- raise dependency on zend-stdlib >= 2.7 + * Tue Aug 4 2015 Remi Collet - 2.5.1-1 -- initial package \ No newline at end of file +- initial package -- cgit