From d934653691f07c5ef7bf3528cba994784d39c5b0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 3 Jan 2022 10:54:37 +0100 Subject: update to 2.16.0 --- composer.json | 3 ++- php-laminas-view.spec | 13 ++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 0893c59..e461191 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "laminas/laminas-paginator": "^2.5", "laminas/laminas-permissions-acl": "^2.6", "laminas/laminas-router": "^3.0.1", - "laminas/laminas-servicemanager": "^3.3", + "laminas/laminas-servicemanager": "^3.4", "laminas/laminas-session": "^2.12", "laminas/laminas-uri": "^2.5", "phpspec/prophecy": "^1.12", @@ -54,6 +54,7 @@ "vimeo/psalm": "^4.10" }, "conflict": { + "container-interop/container-interop": "<1.2", "laminas/laminas-servicemanager": "<3.3", "laminas/laminas-router": "<3.0.1", "zendframework/zend-view": "*" diff --git a/php-laminas-view.spec b/php-laminas-view.spec index a7e6bb8..7e07afa 100644 --- a/php-laminas-view.spec +++ b/php-laminas-view.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-laminas-view # -# Copyright (c) 2015-2021 Remi Collet +# Copyright (c) 2015-2022 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 af2f714e45eea7f1b1fa6acca2124b824cab3b0b +%global gh_commit cc803ea899e6ca35670b3f21f0b74e93053f2c86 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-view @@ -18,7 +18,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_project} -Version: 2.15.0 +Version: 2.16.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -63,7 +63,7 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 # "laminas/laminas-paginator": "^2.5", # "laminas/laminas-permissions-acl": "^2.6", # "laminas/laminas-router": "^3.0.1", -# "laminas/laminas-servicemanager": "^3.3", +# "laminas/laminas-servicemanager": "^3.4", # "laminas/laminas-session": "^2.12", # "laminas/laminas-uri": "^2.5", # "phpspec/prophecy": "^1.12", @@ -89,7 +89,7 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-paginator) >= 2.5 BuildRequires: (php-autoloader(%{gh_owner}/laminas-permissions-acl) >= 2.6 with php-autoloader(%{gh_owner}/laminas-permissions-acl) < 3) %endif BuildRequires: (php-autoloader(%{gh_owner}/laminas-router) >= 3.0.1 with php-autoloader(%{gh_owner}/laminas-router) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.4 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.12 with php-autoloader(%{gh_owner}/laminas-session) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-uri) >= 2.5 with php-autoloader(%{gh_owner}/laminas-uri) < 3) BuildRequires: (php-composer(phpspec/prophecy) >= 1.12.0 with php-composer(phpspec/prophecy) < 2) @@ -329,6 +329,9 @@ exit $ret %changelog +* Mon Jan 3 2022 Remi Collet - 2.16.0-1 +- update to 2.16.0 + * Mon Dec 20 2021 Remi Collet - 2.15.0-1 - update to 2.15.0 -- cgit