From 255fd1cf2b8d6f4e78d9f3f3bc75f8f454cf4ada Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Feb 23 2016 16:15:07 +0000 Subject: v2.6.0 --- diff --git a/.gitignore b/.gitignore index f5a1b46..c291f87 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /php-zendframework-zend-session-2.5.2-f66caae.tgz +/php-zendframework-zend-session-2.6.0-7feebb6.tgz diff --git a/php-zendframework-zend-session.spec b/php-zendframework-zend-session.spec index d3d648d..e364590 100644 --- a/php-zendframework-zend-session.spec +++ b/php-zendframework-zend-session.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-zendframework-zend-session # -# Copyright (c) 2015 Remi Collet +# Copyright (c) 2015-2016 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit f66caae318c40edb8a6edc22cc2a4e286cb4d064 +%global gh_commit 7feebb6a49d57362eb8b7e7e554297bf716c70ee %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-session @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.5.2 -Release: 2%{?dist} +Version: 2.6.0 +Release: 1%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -42,46 +42,49 @@ BuildRequires: php-spl BuildRequires: php-composer(%{gh_owner}/zend-eventmanager) >= 2.5 BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 2.5 # From composer, "require-dev": { -# "zendframework/zend-cache": "~2.5", -# "zendframework/zend-db": "~2.5", -# "zendframework/zend-http": "~2.5", -# "zendframework/zend-servicemanager": "~2.5", -# "zendframework/zend-validator": "~2.5", +# "zendframework/zend-cache": "^2.6.1", +# "zendframework/zend-db": "^2.7", +# "zendframework/zend-http": "^2.5.4", +# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", +# "zendframework/zend-validator": "^2.6", +# "container-interop/container-interop": "^1.1", # "fabpot/php-cs-fixer": "1.7.*", # "phpunit/PHPUnit": "~4.0" -BuildRequires: php-composer(%{gh_owner}/zend-cache) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-db) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-http) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-servicemanager) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-validator) >= 2.5 +BuildRequires: php-composer(%{gh_owner}/zend-cache) >= 2.6.1 +BuildRequires: php-composer(%{gh_owner}/zend-db) >= 2.7 +BuildRequires: php-composer(%{gh_owner}/zend-http) >= 2.5.4 +BuildRequires: php-composer(%{gh_owner}/zend-servicemanager) >= 2.7.5 +BuildRequires: php-composer(%{gh_owner}/zend-validator) >= 2.6 +BuildRequires: php-composer(container-interop/container-interop) >= 1.1 BuildRequires: php-composer(phpunit/phpunit) >= 4.0 # Autoloader BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 %endif # From composer, "require": { -# "php": ">=5.5", -# "zendframework/zend-eventmanager": "~2.5", -# "zendframework/zend-stdlib": "~2.5" +# "php": "^5.5 || ^7.0", +# "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", +# "zendframework/zend-stdlib": "^2.7 || ^3.0" Requires: php(language) >= 5.5 %if ! %{bootstrap} -Requires: php-composer(%{gh_owner}/zend-eventmanager) >= 2.5 -Requires: php-composer(%{gh_owner}/zend-eventmanager) < 3 -Requires: php-composer(%{gh_owner}/zend-stdlib) >= 2.5 -Requires: php-composer(%{gh_owner}/zend-stdlib) < 3 +Requires: php-composer(%{gh_owner}/zend-eventmanager) >= 2.6.2 +Requires: php-composer(%{gh_owner}/zend-eventmanager) < 4 +Requires: php-composer(%{gh_owner}/zend-stdlib) >= 2.7 +Requires: php-composer(%{gh_owner}/zend-stdlib) < 4 # From composer, "suggest": { # "zendframework/zend-cache": "Zend\\Cache component", # "zendframework/zend-db": "Zend\\Db component", -# "zendframework/zend-eventmanager": "Zend\\EventManager component", # "zendframework/zend-http": "Zend\\Http component", -# "zendframework/zend-servicemanager": "Zend\\ServiceManager component", +# "zendframework/zend-servicemanager": "Zend\\ServiceManager component", # "zendframework/zend-validator": "Zend\\Validator component" +%if 0%{?fedora} >= 21 Suggests: php-composer(%{gh_owner}/zend-cache) Suggests: php-composer(%{gh_owner}/zend-db) Suggests: php-composer(%{gh_owner}/zend-http) Suggests: php-composer(%{gh_owner}/zend-servicemanager) Suggests: php-composer(%{gh_owner}/zend-validator) %endif +%endif # From phpcompatinfo report for version 2.5.2 Requires: php-date Requires: php-hash @@ -109,6 +112,7 @@ oriented interface. %install + mkdir -p %{buildroot}%{php_home}/Zend/ cp -pr src %{buildroot}%{php_home}/Zend/%{library} @@ -116,14 +120,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 @@ -131,13 +135,19 @@ EOF # sqlite is too old rm test/SaveHandler/DbTableGatewayTest.php %endif + %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} + +if which php70; then + php70 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} +fi %else : Test suite disabled %endif %files +%{!?_licensedir:%global license %%doc} %license LICENSE.md %doc CONTRIBUTING.md README.md %doc composer.json @@ -145,6 +155,11 @@ rm test/SaveHandler/DbTableGatewayTest.php %changelog +* Tue Feb 23 2016 Remi Collet - 2.6.0-1 +- update to 2.6.0 +- raise dependency on zend-eventmanager >= 2.6.2 +- raise dependency on zend-stdlib >= 2.7 + * Thu Feb 04 2016 Fedora Release Engineering - 2.5.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 7704369..c595f3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f18038d5dc9aed27e7a22204fbfe2b6 php-zendframework-zend-session-2.5.2-f66caae.tgz +0b9976719bba8430e2aa79b936e808c1 php-zendframework-zend-session-2.6.0-7feebb6.tgz