From 5b6dedd39d7ca5206771b03ef7f0dd50a6a7dd3b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 25 Nov 2015 14:49:39 +0100 Subject: php-zendframework-zend-captcha: 2.5.2 --- makesrc.sh | 1 + php-zendframework-zend-captcha.spec | 26 +++++++++++++++----------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/makesrc.sh b/makesrc.sh index 24fbf81..e9a1ec5 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -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-captcha.spec b/php-zendframework-zend-captcha.spec index af0b516..387555e 100644 --- a/php-zendframework-zend-captcha.spec +++ b/php-zendframework-zend-captcha.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit c647a86224030543401634dbafd514074b49b2b6 +%global gh_commit 43c276df6e94e498bf530538aea53876a24fc47c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-captcha @@ -20,7 +20,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.5.1 +Version: 2.5.2 Release: 1%{?dist} Summary: Zend Framework %{library} component @@ -34,7 +34,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.3.23 +BuildRequires: php(language) >= 5.5 BuildRequires: php-date BuildRequires: php-gd BuildRequires: php-spl @@ -57,17 +57,17 @@ BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 %endif # From composer, "require": { -# "php": ">=5.3.23", +# "php": ">=5.5", # "zendframework/zend-math": "~2.5", # "zendframework/zend-stdlib": "~2.5" -Requires: php(language) >= 5.3.23 +Requires: php(language) >= 5.5 %if ! %{bootstrap} Requires: php-composer(%{gh_owner}/zend-math) >= 2.5 Requires: php-composer(%{gh_owner}/zend-math) < 3 Requires: php-composer(%{gh_owner}/zend-stdlib) >= 2.5 Requires: php-composer(%{gh_owner}/zend-stdlib) < 3 # From composer, "suggest": { -# "zendframework/zend-resources": "Translations of captcha messages", +# "zendframework/zend-i18n-resources": "Translations of captcha messages", # "zendframework/zend-session": "Zend\\Session component", # "zendframework/zend-text": "Zend\\Text component", # "zendframework/zend-validator": "Zend\\Validator component", @@ -117,14 +117,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 @@ -153,5 +153,9 @@ rm -rf %{buildroot} %changelog +* Wed Nov 25 2015 Remi Collet - 2.5.2-1 +- update to 2.5.2 +- raise dependency on PHP 5.5 + * Tue Aug 4 2015 Remi Collet - 2.5.1-1 - initial package \ No newline at end of file -- cgit