From 5bd225f90633e68148490d154e88f873c2cf81fa Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 23 Sep 2015 17:49:39 +0200 Subject: php-zendframework-zend-modulemanager: 2.5.3 --- makesrc.sh | 1 + php-zendframework-zend-modulemanager.spec | 28 ++++++++++++++++------------ 2 files changed, 17 insertions(+), 12 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-modulemanager.spec b/php-zendframework-zend-modulemanager.spec index ddaef00..d090b9c 100644 --- a/php-zendframework-zend-modulemanager.spec +++ b/php-zendframework-zend-modulemanager.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 80592b9ba35a5f91978235c458851cc3e914ae90 +%global gh_commit afaf873a3b420ba017933c15eb2a93dff433a7d1 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-modulemanager @@ -20,7 +20,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.5.1 +Version: 2.5.3 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-spl BuildRequires: php-composer(%{gh_owner}/zend-eventmanager) >= 2.5 BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 2.5 @@ -61,15 +61,15 @@ BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 %endif # From composer, "require": { -# "php": ">=5.3.23", +# "php": ">=5.5", # "zendframework/zend-eventmanager": "~2.5", -# "zendframework/zend-stdlib": "~2.5" -Requires: php(language) >= 5.3.23 +# "zendframework/zend-stdlib": ">=2.5.0,<2.7.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-stdlib) < 2.7 # From composer, "suggest": { # "zendframework/zend-config": "Zend\\Config component", # "zendframework/zend-console": "Zend\\Console component", @@ -121,14 +121,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 @@ -152,5 +152,9 @@ rm -rf %{buildroot} %changelog +* Thu Sep 10 2015 Remi Collet - 2.5.3-1 +- update to 2.5.3 +- raise minimum php version to 5.5 + * Tue Aug 4 2015 Remi Collet - 2.5.1-1 - initial package \ No newline at end of file -- cgit