diff options
| -rw-r--r-- | composer.json | 10 | ||||
| -rw-r--r-- | php-zendframework-zend-view.spec | 72 |
2 files changed, 67 insertions, 15 deletions
diff --git a/composer.json b/composer.json index a8da6d8..b9eaf23 100644 --- a/composer.json +++ b/composer.json @@ -15,6 +15,7 @@ "require": { "php": "^5.6 || ^7.0", "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", + "zendframework/zend-json": "^2.6.1 || ^3.0", "zendframework/zend-loader": "^2.5", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, @@ -30,10 +31,9 @@ "zendframework/zend-filter": "^2.6.1", "zendframework/zend-http": "^2.5.4", "zendframework/zend-i18n": "^2.6", - "zendframework/zend-json": "^2.6.1", "zendframework/zend-log": "^2.7", "zendframework/zend-modulemanager": "^2.7.1", - "zendframework/zend-mvc": "^2.7 || ^3.0", + "zendframework/zend-mvc": "^2.7.14 || ^3.0", "zendframework/zend-navigation": "^2.5", "zendframework/zend-paginator": "^2.5", "zendframework/zend-permissions-acl": "^2.6", @@ -50,8 +50,8 @@ "zendframework/zend-filter": "Zend\\Filter component", "zendframework/zend-http": "Zend\\Http component", "zendframework/zend-i18n": "Zend\\I18n component", - "zendframework/zend-json": "Zend\\Json component", "zendframework/zend-mvc": "Zend\\Mvc component", + "zendframework/zend-mvc-plugin-flashmessenger": "zend-mvc-plugin-flashmessenger component, if you want to use the FlashMessenger view helper with zend-mvc versions 3 and up", "zendframework/zend-navigation": "Zend\\Navigation component", "zendframework/zend-paginator": "Zend\\Paginator component", "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component", @@ -65,8 +65,8 @@ }, "extra": { "branch-alias": { - "dev-master": "2.10.x-dev", - "dev-develop": "2.11.x-dev" + "dev-master": "2.11.x-dev", + "dev-develop": "2.12.x-dev" } }, "autoload-dev": { diff --git a/php-zendframework-zend-view.spec b/php-zendframework-zend-view.spec index fe0fe49..cf71537 100644 --- a/php-zendframework-zend-view.spec +++ b/php-zendframework-zend-view.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 4478cc5dd960e2339d88b363ef99fa278700e80e +%global gh_commit 0428d6b2a67c7058451394921c90c5576ac5b373 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-view @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.10.0 -Release: 4%{?dist} +Version: 2.11.1 +Release: 1%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -39,9 +39,19 @@ BuildRequires: php-dom BuildRequires: php-filter BuildRequires: php-pcre BuildRequires: php-spl +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 with php-autoloader(%{gh_owner}/zend-eventmanager) < 4) +Requires: (php-autoloader(%{gh_owner}/zend-json) >= 2.6.1 with php-autoloader(%{gh_owner}/zend-json) < 4) +Requires: (php-autoloader(%{gh_owner}/zend-loader) >= 2.5 with php-autoloader(%{gh_owner}/zend-loader) < 3) +Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +# remirepo:6 +%else BuildRequires: php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.5 +BuildRequires: php-autoloader(%{gh_owner}/zend-json) >= 2.6.1 BuildRequires: php-autoloader(%{gh_owner}/zend-loader) >= 2.5 BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.5 +%endif # From composer, "require-dev": { # "phpunit/phpunit": "^5.7.15 || ^6.0.8", # "zendframework/zend-authentication": "^2.5", @@ -54,10 +64,9 @@ BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.5 # "zendframework/zend-filter": "^2.6.1", # "zendframework/zend-http": "^2.5.4", # "zendframework/zend-i18n": "^2.6", -# "zendframework/zend-json": "^2.6.1", # "zendframework/zend-log": "^2.7", # "zendframework/zend-modulemanager": "^2.7.1", -# "zendframework/zend-mvc": "^2.7 || ^3.0", +# "zendframework/zend-mvc": "^2.7.14 || ^3.0", # "zendframework/zend-navigation": "^2.5", # "zendframework/zend-paginator": "^2.5", # "zendframework/zend-permissions-acl": "^2.6", @@ -66,6 +75,30 @@ BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.5 # "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", # "zendframework/zend-session": "^2.8.1", # "zendframework/zend-uri": "^2.5" +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(%{gh_owner}/zend-authentication) >= 2.5 with php-composer(%{gh_owner}/zend-authentication) < 3) +BuildRequires: (php-composer(%{gh_owner}/zend-cache) >= 2.6.1 with php-composer(%{gh_owner}/zend-cache) < 3) +BuildRequires: (php-composer(%{gh_owner}/zend-config) >= 2.6 with php-composer(%{gh_owner}/zend-config) < 3) +BuildRequires: (php-composer(%{gh_owner}/zend-console) >= 2.6 with php-composer(%{gh_owner}/zend-console) < 3) +BuildRequires: (php-composer(%{gh_owner}/zend-escaper) >= 2.5 with php-composer(%{gh_owner}/zend-escaper) < 3) +BuildRequires: (php-composer(%{gh_owner}/zend-feed) >= 2.7 with php-composer(%{gh_owner}/zend-feed) < 3) +BuildRequires: (php-composer(%{gh_owner}/zend-filter) >= 2.6.1 with php-composer(%{gh_owner}/zend-filter) < 3) +BuildRequires: (php-composer(%{gh_owner}/zend-http) >= 2.5.4 with php-composer(%{gh_owner}/zend-http) < 3) +BuildRequires: (php-composer(%{gh_owner}/zend-i18n) >= 2.6 with php-composer(%{gh_owner}/zend-i18n) < 3) +BuildRequires: (php-composer(%{gh_owner}/zend-log) >= 2.7 with php-composer(%{gh_owner}/zend-log) < 3) +BuildRequires: (php-composer(%{gh_owner}/zend-modulemanager) >= 2.7.1 with php-composer(%{gh_owner}/zend-modulemanager) < 3) +BuildRequires: (php-composer(%{gh_owner}/zend-mvc) >= 2.7.14 with php-composer(%{gh_owner}/zend-mvc) < 4) +BuildRequires: (php-composer(%{gh_owner}/zend-navigation) >= 2.5 with php-composer(%{gh_owner}/zend-navigation) < 3) +BuildRequires: (php-composer(%{gh_owner}/zend-paginator) >= 2.5 with php-composer(%{gh_owner}/zend-paginator) < 3) +BuildRequires: (php-composer(%{gh_owner}/zend-permissions-acl) >= 2.6 with php-composer(%{gh_owner}/zend-permissions-acl) < 3) +BuildRequires: (php-composer(%{gh_owner}/zend-router) >= 3.0.1 with php-composer(%{gh_owner}/zend-router) < 4) +BuildRequires: (php-composer(%{gh_owner}/zend-serializer) >= 2.6.1 with php-composer(%{gh_owner}/zend-serializer) < 3) +BuildRequires: (php-composer(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-composer(%{gh_owner}/zend-servicemanager) < 4) +BuildRequires: (php-composer(%{gh_owner}/zend-session) >= 2.8.1 with php-composer(%{gh_owner}/zend-session) < 3) +BuildRequires: (php-composer(%{gh_owner}/zend-uri) >= 2.5 with php-composer(%{gh_owner}/zend-uri) < 3) +# remirepo:22 +%else BuildRequires: php-composer(%{gh_owner}/zend-authentication) >= 2.5 BuildRequires: php-composer(%{gh_owner}/zend-cache) >= 2.6.1 BuildRequires: php-composer(%{gh_owner}/zend-config) >= 2.6 @@ -75,10 +108,9 @@ BuildRequires: php-composer(%{gh_owner}/zend-feed) >= 2.7 BuildRequires: php-composer(%{gh_owner}/zend-filter) >= 2.6.1 BuildRequires: php-composer(%{gh_owner}/zend-http) >= 2.5.4 BuildRequires: php-composer(%{gh_owner}/zend-i18n) >= 2.6 -BuildRequires: php-composer(%{gh_owner}/zend-json) >= 2.6.1 BuildRequires: php-composer(%{gh_owner}/zend-log) >= 2.7 BuildRequires: php-composer(%{gh_owner}/zend-modulemanager) >= 2.7.1 -BuildRequires: php-composer(%{gh_owner}/zend-mvc) >= 2.7 +BuildRequires: php-composer(%{gh_owner}/zend-mvc) >= 2.7.14 BuildRequires: php-composer(%{gh_owner}/zend-navigation) >= 2.5 BuildRequires: php-composer(%{gh_owner}/zend-paginator) >= 2.5 BuildRequires: php-composer(%{gh_owner}/zend-permissions-acl) >= 2.6 @@ -87,6 +119,7 @@ BuildRequires: php-composer(%{gh_owner}/zend-serializer) >= 2.6.1 BuildRequires: php-composer(%{gh_owner}/zend-servicemanager) >= 2.7.5 BuildRequires: php-composer(%{gh_owner}/zend-session) >= 2.8.1 BuildRequires: php-composer(%{gh_owner}/zend-uri) >= 2.5 +%endif BuildRequires: phpunit6 # Not in composer.json %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 @@ -101,16 +134,28 @@ BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^5.6 || ^7.0", # "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", +# "zendframework/zend-json": "^2.6.1 || ^3.0", # "zendframework/zend-loader": "^2.5", # "zendframework/zend-stdlib": "^2.7 || ^3.0" Requires: php(language) >= 5.6 %if ! %{bootstrap} +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 with php-autoloader(%{gh_owner}/zend-eventmanager) < 4) +Requires: (php-autoloader(%{gh_owner}/zend-json) >= 2.6.1 with php-autoloader(%{gh_owner}/zend-json) < 4) +Requires: (php-autoloader(%{gh_owner}/zend-loader) >= 2.5 with php-autoloader(%{gh_owner}/zend-loader) < 3) +Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +# remirepo:10 +%else Requires: php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 Requires: php-autoloader(%{gh_owner}/zend-eventmanager) < 4 +Requires: php-autoloader(%{gh_owner}/zend-json) < 4 +Requires: php-autoloader(%{gh_owner}/zend-json) >= 2.6.1 Requires: php-autoloader(%{gh_owner}/zend-loader) >= 2.5 Requires: php-autoloader(%{gh_owner}/zend-loader) < 3 Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 +%endif # From composer, "suggest": { # "zendframework/zend-authentication": "Zend\\Authentication component", # "zendframework/zend-escaper": "Zend\\Escaper component", @@ -118,8 +163,8 @@ Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 # "zendframework/zend-filter": "Zend\\Filter component", # "zendframework/zend-http": "Zend\\Http component", # "zendframework/zend-i18n": "Zend\\I18n component", -# "zendframework/zend-json": "Zend\\Json component", # "zendframework/zend-mvc": "Zend\\Mvc component", +# "zendframework/zend-mvc-plugin-flashmessenger": "zend-mvc-plugin-flashmessenger component, if you want to use the FlashMessenger view helper with zend-mvc versions 3 and up", # "zendframework/zend-navigation": "Zend\\Navigation component", # "zendframework/zend-paginator": "Zend\\Paginator component", # "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component", @@ -132,8 +177,8 @@ Suggests: php-composer(%{gh_owner}/zend-feed) Suggests: php-composer(%{gh_owner}/zend-filter) Suggests: php-composer(%{gh_owner}/zend-http) Suggests: php-composer(%{gh_owner}/zend-i18n) -Suggests: php-composer(%{gh_owner}/zend-json) Suggests: php-composer(%{gh_owner}/zend-mvc) +Suggests: php-composer(%{gh_owner}/zend-mvc-plugin-flashmessenger) Suggests: php-composer(%{gh_owner}/zend-navigation) Suggests: php-composer(%{gh_owner}/zend-paginator) Suggests: php-composer(%{gh_owner}/zend-permissions-acl) @@ -239,7 +284,7 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; EOF ret=0 -for cmd in php php70 php71 php72; do +for cmd in php php70 php71 php72 php73; do if which $cmd; then $cmd %{_bindir}/phpunit6 --verbose || ret=1 fi @@ -260,6 +305,13 @@ exit $ret %changelog +* Tue Dec 11 2018 Remi Collet <remi@remirepo.net> - 2.11.1-1 +- update to 2.11.1 +- add mandatory dependency on zendframework/zend-json +- add optional dependency on zendframework/zend-mvc-plugin-flashmessenger +- raise dependency on zendframework/zend-mvc 2.7.14 +- use range dependencies + * Thu Dec 6 2018 Remi Collet <remi@remirepo.net> - 2.10.0-4 - cleanup for EL-8 |