From 8fac91def4aef7786827738faca8516f508a8111 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 8 Jan 2019 07:51:54 +0100 Subject: update to 2.14.0 raise dependency on zend-stdlib 3.2.1 --- composer.json | 6 +++--- php-zendframework-zend-form.spec | 22 +++++++++++++--------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index ee89f26..8d29eb2 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "php": "^5.6 || ^7.0", "zendframework/zend-inputfilter": "^2.8", "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" + "zendframework/zend-stdlib": "^3.2.1" }, "require-dev": { "doctrine/annotations": "~1.0", @@ -69,8 +69,8 @@ }, "extra": { "branch-alias": { - "dev-master": "2.13.x-dev", - "dev-develop": "2.14.x-dev" + "dev-master": "2.14.x-dev", + "dev-develop": "2.15.x-dev" }, "zf": { "component": "Zend\\Form", diff --git a/php-zendframework-zend-form.spec b/php-zendframework-zend-form.spec index 395388d..b877e28 100644 --- a/php-zendframework-zend-form.spec +++ b/php-zendframework-zend-form.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-zendframework-zend-form # -# Copyright (c) 2015-2018 Remi Collet +# Copyright (c) 2015-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit c713a12ccbd43148b71c9339e171ca11e3f8a1da +%global gh_commit afab173513e6930aa8ae86cc755e3b2d4874d6f6 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-form @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.13.0 -Release: 2%{?dist} +Version: 2.14.0 +Release: 1%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -44,12 +44,12 @@ BuildRequires: php-mcrypt %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-autoloader(%{gh_owner}/zend-inputfilter) >= 2.8 with php-autoloader(%{gh_owner}/zend-inputfilter) < 3) BuildRequires: (php-autoloader(%{gh_owner}/zend-hydrator) >= 1.1 with php-autoloader(%{gh_owner}/zend-hydrator) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) # remirepo:5 %else BuildRequires: php-autoloader(%{gh_owner}/zend-inputfilter) >= 2.8 BuildRequires: php-autoloader(%{gh_owner}/zend-hydrator) >= 1.0 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 %endif # From composer, "require-dev": { # "doctrine/annotations": "~1.0", @@ -113,14 +113,14 @@ BuildRequires: php-fedora-autoloader-devel # "php": "^5.6 || ^7.0", # "zendframework/zend-inputfilter": "^2.8", # "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0", -# "zendframework/zend-stdlib": "^2.7 || ^3.0" +# "zendframework/zend-stdlib": "^3.2.1" Requires: php(language) >= 5.6 %if ! %{bootstrap} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-autoloader(%{gh_owner}/zend-inputfilter) >= 2.8 with php-autoloader(%{gh_owner}/zend-inputfilter) < 3) Requires: (php-autoloader(%{gh_owner}/zend-hydrator) >= 1.1 with php-autoloader(%{gh_owner}/zend-hydrator) < 4) -Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) # Mandory because of Polyfill Requires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4) # remirepo:11 @@ -129,7 +129,7 @@ Requires: php-autoloader(%{gh_owner}/zend-inputfilter) >= 2.8 Requires: php-autoloader(%{gh_owner}/zend-inputfilter) < 3 Requires: php-autoloader(%{gh_owner}/zend-hydrator) >= 1.1 Requires: php-autoloader(%{gh_owner}/zend-hydrator) < 3 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 # Mandory because of Polyfill Requires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 @@ -255,6 +255,10 @@ exit $ret %changelog +* Tue Jan 8 2019 Remi Collet - 2.14.0-1 +- update to 2.14.0 +- raise dependency on zend-stdlib 3.2.1 + * Wed Dec 12 2018 Remi Collet - 2.13.0-1 - update to 2.13.0 - allow zend-hydrator 3 -- cgit