From fd7425cf87d27ae12801215c59dc7f288493af70 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Jun 2016 12:47:26 +0200 Subject: php-zendframework-zend-form: 2.9.0 --- composer.json | 23 ++++++++++++----------- makesrc.sh | 2 +- php-zendframework-zend-form.spec | 25 ++++++++++++------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/composer.json b/composer.json index 04cbf8b..5d4d313 100644 --- a/composer.json +++ b/composer.json @@ -40,22 +40,20 @@ "phpunit/phpunit": "^4.8" }, "suggest": { - "zendframework/zend-captcha": "Zend\\Captcha component", - "zendframework/zend-code": "Zend\\Code component", - "zendframework/zend-eventmanager": "Zend\\EventManager component", - "zendframework/zend-filter": "Zend\\Filter component", - "zendframework/zend-i18n": "Zend\\I18n component", - "zendframework/zend-servicemanager": "Zend\\ServiceManager component", - "zendframework/zend-validator": "Zend\\Validator component", - "zendframework/zend-view": "Zend\\View component", - "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component" + "zendframework/zend-captcha": "^2.5.4, required for using CAPTCHA form elements", + "zendframework/zend-code": "^2.6 || ^3.0, required to use zend-form annotations support", + "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, reuired for zend-form annotations support", + "zendframework/zend-i18n": "^2.6, required when using zend-form view helpers", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, required to use the form factories or provide services", + "zendframework/zend-view": "^2.6.2, required for using the zend-form view helpers", + "zendframework/zendservice-recaptcha": "in order to use the ReCaptcha form element" }, "minimum-stability": "dev", "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "2.8-dev", - "dev-develop": "2.9-dev" + "dev-master": "2.9-dev", + "dev-develop": "2.10-dev" }, "zf": { "component": "Zend\\Form", @@ -67,6 +65,9 @@ "ZendTest\\Form\\": "test/" } }, + "config": { + "process-timeout": 0 + }, "scripts": { "check": [ "@cs-check", diff --git a/makesrc.sh b/makesrc.sh index e9a1ec5..87d223d 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -16,7 +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 +cp composer.json ../composer.json popd echo "Archiving..." diff --git a/php-zendframework-zend-form.spec b/php-zendframework-zend-form.spec index 10f4bd5..abaaea5 100644 --- a/php-zendframework-zend-form.spec +++ b/php-zendframework-zend-form.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 140f82ea93180a083fe46edba17d1860ff58308e +%global gh_commit 3abb688fda20989b2e2b444efc1dba173abb2e07 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-form @@ -20,7 +20,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.8.3 +Version: 2.9.0 Release: 1%{?dist} Summary: Zend Framework %{library} component @@ -95,23 +95,19 @@ Requires: php-composer(%{gh_owner}/zend-hydrator) < 3 Requires: php-composer(%{gh_owner}/zend-stdlib) >= 2.7 Requires: php-composer(%{gh_owner}/zend-stdlib) < 4 # From composer, "suggest": { -# "zendframework/zend-captcha": "Zend\\Captcha component", -# "zendframework/zend-code": "Zend\\Code component", -# "zendframework/zend-eventmanager": "Zend\\EventManager component", -# "zendframework/zend-filter": "Zend\\Filter component", -# "zendframework/zend-i18n": "Zend\\I18n component", -# "zendframework/zend-servicemanager": "Zend\\ServiceManager component", -# "zendframework/zend-validator": "Zend\\Validator component", -# "zendframework/zend-view": "Zend\\View component", -# "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component" +# "zendframework/zend-captcha": "^2.5.4, required for using CAPTCHA form elements", +# "zendframework/zend-code": "^2.6 || ^3.0, required to use zend-form annotations support", +# "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, reuired for zend-form annotations support", +# "zendframework/zend-i18n": "^2.6, required when using zend-form view helpers", +# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, required to use the form factories or provide services", +# "zendframework/zend-view": "^2.6.2, required for using the zend-form view helpers", +# "zendframework/zendservice-recaptcha": "in order to use the ReCaptcha form element" %if 0%{?fedora} >= 21 Suggests: php-composer(%{gh_owner}/zend-captcha) Suggests: php-composer(%{gh_owner}/zend-code) Suggests: php-composer(%{gh_owner}/zend-eventmanager) -Suggests: php-composer(%{gh_owner}/zend-filter) Suggests: php-composer(%{gh_owner}/zend-i18n) Suggests: php-composer(%{gh_owner}/zend-servicemanager) -Suggests: php-composer(%{gh_owner}/zend-validator) Suggests: php-composer(%{gh_owner}/zend-view) #Suggests: php-composer(%{gh_owner}/zendservice-recaptcha) %endif @@ -195,6 +191,9 @@ rm -rf %{buildroot} %changelog +* Fri Jun 10 2016 Remi Collet - 2.9.0-1 +- update to 2.9.0 + * Wed May 4 2016 Remi Collet - 2.8.3-1 - update to 2.8.3 -- cgit