diff options
| -rwxr-xr-x | makesrc.sh | 1 | ||||
| -rw-r--r-- | php-zendframework-zend-session.spec | 60 |
2 files changed, 34 insertions, 27 deletions
@@ -16,6 +16,7 @@ git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT echo "Getting commit..." pushd $PROJECT-$COMMIT git checkout $COMMIT +cp composer.json ../composer-$VERSION.json popd echo "Archiving..." diff --git a/php-zendframework-zend-session.spec b/php-zendframework-zend-session.spec index 8281ef0..471706d 100644 --- a/php-zendframework-zend-session.spec +++ b/php-zendframework-zend-session.spec @@ -7,7 +7,7 @@ # 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,7 +20,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.5.2 +Version: 2.6.0 Release: 1%{?dist} Summary: Zend Framework %{library} component @@ -43,39 +43,40 @@ 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) @@ -121,14 +122,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 <?php require_once '%{php_home}/Zend/Loader/AutoloaderFactory.php'; -Zend\\Loader\\AutoloaderFactory::factory(array( - 'Zend\\Loader\\StandardAutoloader' => 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 @@ -161,5 +162,10 @@ rm -rf %{buildroot} %changelog +* Tue Feb 23 2016 Remi Collet <remi@fedoraproject.org> - 2.6.0-1 +- update to 2.6.0 +- raise dependency on zend-eventmanager >= 2.6.2 +- raise dependency on zend-stdlib >= 2.7 + * Tue Aug 4 2015 Remi Collet <remi@fedoraproject.org> - 2.5.2-1 -- initial package
\ No newline at end of file +- initial package |