From 983e64591a4b19d7a2ba9c9f19bae7d6801dedd8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 11 Jan 2017 19:33:15 +0100 Subject: php-zendframework-zend-expressive-platesrenderer: 1.2.0 --- composer.json | 25 +++++++-------- ...ndframework-zend-expressive-platesrenderer.spec | 36 ++++++++++++++-------- 2 files changed, 36 insertions(+), 25 deletions(-) diff --git a/composer.json b/composer.json index acfd277..f6efbc0 100644 --- a/composer.json +++ b/composer.json @@ -13,30 +13,31 @@ ], "extra": { "branch-alias": { - "dev-master": "1.1-dev", - "dev-develop": "1.2-dev" + "dev-master": "1.2-dev", + "dev-develop": "1.3-dev" } }, "require": { - "php": "^5.5 || ^7.0", + "php": "^5.6 || ^7.0", "container-interop/container-interop": "^1.1", "league/plates": "^3.1", "zendframework/zend-expressive-template": "^1.0", - "zendframework/zend-expressive-helpers": "^2.0" + "zendframework/zend-expressive-helpers": "^2.2 || ^3.0", + "zendframework/zend-expressive-router": "^1.3.2 || ^2.0" }, "require-dev": { - "phpunit/phpunit": "^4.7", - "squizlabs/php_codesniffer": "^2.3" + "phpunit/phpunit": "^5.7", + "zendframework/zend-coding-standard": "~1.0.0" }, "autoload": { - "psr-4": { - "Zend\\Expressive\\Plates\\": "src/" - } + "psr-4": { + "Zend\\Expressive\\Plates\\": "src/" + } }, "autoload-dev": { - "psr-4": { - "ZendTest\\Expressive\\Plates\\": "test/" - } + "psr-4": { + "ZendTest\\Expressive\\Plates\\": "test/" + } }, "suggest": { "mouf/pimple-interop": "^1.0 to use Pimple for dependency injection", diff --git a/php-zendframework-zend-expressive-platesrenderer.spec b/php-zendframework-zend-expressive-platesrenderer.spec index 41b26b8..c62362f 100644 --- a/php-zendframework-zend-expressive-platesrenderer.spec +++ b/php-zendframework-zend-expressive-platesrenderer.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 09aa7513bd1838a1d66f8619e94cf2ff51243fb1 +%global gh_commit ee7f5f878650b8bcdb3aa04fdbb92420c9db33a4 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-expressive-platesrenderer @@ -21,13 +21,13 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 1.1.0 +Version: 1.2.0 Release: 1%{?dist} Summary: Plates integration for %{library} Group: Development/Libraries License: BSD -URL: https://framework.zend.com/ +URL: https://zendframework.github.io/zend-expressive/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh @@ -35,17 +35,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.5 +BuildRequires: php(language) >= 5.6 BuildRequires: php-composer(container-interop/container-interop) >= 1.1 BuildRequires: php-composer(league/plates) >= 3.1 BuildRequires: php-composer(%{gh_owner}/zend-expressive-template) >= 1.0 -BuildRequires: php-composer(%{gh_owner}/zend-expressive-helpers) >= 2.0 +BuildRequires: php-composer(%{gh_owner}/zend-expressive-helpers) >= 2.2 +BuildRequires: php-composer(%{gh_owner}/zend-expressive-router) >= 1.3.2 BuildRequires: php-reflection BuildRequires: php-spl # From composer, "require-dev": { -# "phpunit/phpunit": "^4.7", -# "squizlabs/php_codesniffer": "^2.3" -BuildRequires: php-composer(phpunit/phpunit) >= 4.7 +# "phpunit/phpunit": "^5.7", +# "zendframework/zend-coding-standard": "~1.0.0" +BuildRequires: php-composer(phpunit/phpunit) >= 5.7 # Autoloader BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 # For dependencies autoloader @@ -53,20 +54,23 @@ BuildRequires: php-zendframework-zend-loader >= 2.5.1-4 %endif # From composer, "require": { -# "php": "^5.5 || ^7.0", +# "php": "^5.6 || ^7.0", # "container-interop/container-interop": "^1.1", # "league/plates": "^3.1", # "zendframework/zend-expressive-template": "^1.0", -# "zendframework/zend-expressive-helpers": "^2.0" -Requires: php(language) >= 5.5 +# "zendframework/zend-expressive-helpers": "^2.2 || ^3.0", +# "zendframework/zend-expressive-router": "^1.3.2 || ^2.0" +Requires: php(language) >= 5.6 Requires: php-composer(container-interop/container-interop) >= 1.1 Requires: php-composer(container-interop/container-interop) < 2 Requires: php-composer(league/plates) >= 3.1 Requires: php-composer(league/plates) < 4 Requires: php-composer(%{gh_owner}/zend-expressive-template) >= 1.0 Requires: php-composer(%{gh_owner}/zend-expressive-template) < 2 -Requires: php-composer(%{gh_owner}/zend-expressive-helpers) >= 2.0 -Requires: php-composer(%{gh_owner}/zend-expressive-helpers) < 3 +Requires: php-composer(%{gh_owner}/zend-expressive-helpers) >= 2.2 +Requires: php-composer(%{gh_owner}/zend-expressive-helpers) < 4 +Requires: php-composer(%{gh_owner}/zend-expressive-router) >= 1.3.2 +Requires: php-composer(%{gh_owner}/zend-expressive-router) < 3 # From phpcompatinfo report for version 1.2.0 Requires: php-reflection Requires: php-spl @@ -174,6 +178,12 @@ rm -rf %{buildroot} %changelog +* Wed Jan 11 2017 Remi Collet - 1.2.0-1 +- update to 1.2.0 +- raise dependency on PHP version 5.6 +- raise dependency on zend-expressive-helpers version 2.2, allow 3.0 +- add dependency on zend-expressive-router + * Sat Jul 2 2016 Remi Collet - 1.1.0-1 - initial package -- cgit