From 6a4fe963f508757fb3c6ef893bc843ba5f745c03 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 31 May 2021 07:41:50 +0200 Subject: update to 1.1.0 (no change) raise dependency on laminas-mvc-plugin-fileprg 1.2 raise dependency on laminas-mvc-plugin-flashmessenger 1.3 raise dependency on laminas-mvc-plugin-identity 1.2 raise dependency on laminas-mvc-plugin-prg 1.3 --- composer.json | 16 +++++--------- php-laminas-mvc-plugins.spec | 51 ++++++++++++++++++++++++-------------------- 2 files changed, 33 insertions(+), 34 deletions(-) diff --git a/composer.json b/composer.json index 1b3f66c..6cc12ad 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,6 @@ ], "homepage": "https://laminas.dev", "support": { - "docs": "https://docs.laminas.dev/laminas-mvc-plugins/", "issues": "https://github.com/laminas/laminas-mvc-plugins/issues", "source": "https://github.com/laminas/laminas-mvc-plugins", "rss": "https://github.com/laminas/laminas-mvc-plugins/releases.atom", @@ -21,9 +20,6 @@ "sort-packages": true }, "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - }, "laminas": { "component": [ "Laminas\\Mvc\\Plugin\\FilePrg", @@ -34,14 +30,12 @@ } }, "require": { - "php": "^5.6 || ^7.0", - "laminas/laminas-mvc-plugin-fileprg": "^1.0", - "laminas/laminas-mvc-plugin-flashmessenger": "^1.0", - "laminas/laminas-mvc-plugin-identity": "^1.0", - "laminas/laminas-mvc-plugin-prg": "^1.0", - "laminas/laminas-zendframework-bridge": "^1.0" + "laminas/laminas-mvc-plugin-fileprg": "^1.2", + "laminas/laminas-mvc-plugin-flashmessenger": "^1.3", + "laminas/laminas-mvc-plugin-identity": "^1.2", + "laminas/laminas-mvc-plugin-prg": "^1.3" }, "replace": { - "zendframework/zend-mvc-plugins": "self.version" + "zendframework/zend-mvc-plugins": "^1.0.1" } } diff --git a/php-laminas-mvc-plugins.spec b/php-laminas-mvc-plugins.spec index 0772483..9e9ed98 100644 --- a/php-laminas-mvc-plugins.spec +++ b/php-laminas-mvc-plugins.spec @@ -1,12 +1,12 @@ # remirepo/Fedora spec file for php-laminas-mvc-plugins # -# Copyright (c) 2016-2020 Remi Collet +# Copyright (c) 2016-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit 896104a57c3898c2ca932c1ec10c6a3afea2f815 +%global gh_commit d127f94f258f9d4ae1a3fa233bead2110cd538a9 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-mvc-plugins @@ -17,7 +17,7 @@ %global subproj Plugin Name: php-%{gh_project} -Version: 1.0.1 +Version: 1.1.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library}/%{subproj} component @@ -30,12 +30,12 @@ BuildArch: noarch BuildRequires: php-cli # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-fileprg) >= 1.0 with php-autoloader(%{gh_owner}/laminas-mvc-plugin-fileprg) < 2) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) >= 1.0 with php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) < 2) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-identity) >= 1.0 with php-autoloader(%{gh_owner}/laminas-mvc-plugin-identity) < 2) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-prg) >= 1.0 with php-autoloader(%{gh_owner}/laminas-mvc-plugin-prg) < 2) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-fileprg) >= 1.2 with php-autoloader(%{gh_owner}/laminas-mvc-plugin-fileprg) < 2) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) >= 1.3 with php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) < 2) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-identity) >= 1.2 with php-autoloader(%{gh_owner}/laminas-mvc-plugin-identity) < 2) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-prg) >= 1.3 with php-autoloader(%{gh_owner}/laminas-mvc-plugin-prg) < 2) BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) -# remirepo:6 +# remirepo:7 %else BuildRequires: php-laminas-mvc-plugin-fileprg BuildRequires: php-laminas-mvc-plugin-flashmessenger @@ -45,21 +45,19 @@ BuildRequires: php-laminas-zendframework-bridge %endif # From composer, "require": { -# "php": "^5.6 || ^7.0", -# "laminas/laminas-mvc-plugin-fileprg": "^1.0", -# "laminas/laminas-mvc-plugin-flashmessenger": "^1.0", -# "laminas/laminas-mvc-plugin-identity": "^1.0", -# "laminas/laminas-mvc-plugin-prg": "^1.0", -# "laminas/laminas-zendframework-bridge": "^1.0" -Requires: php(language) >= 5.6 +# "laminas/laminas-mvc-plugin-fileprg": "^1.2", +# "laminas/laminas-mvc-plugin-flashmessenger": "^1.3", +# "laminas/laminas-mvc-plugin-identity": "^1.2", +# "laminas/laminas-mvc-plugin-prg": "^1.3" # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-fileprg) >= 1.0 with php-autoloader(%{gh_owner}/laminas-mvc-plugin-fileprg) < 2) -Requires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) >= 1.0 with php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) < 2) -Requires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-identity) >= 1.0 with php-autoloader(%{gh_owner}/laminas-mvc-plugin-identity) < 2) -Requires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-prg) >= 1.0 with php-autoloader(%{gh_owner}/laminas-mvc-plugin-prg) < 2) +Requires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-fileprg) >= 1.2 with php-autoloader(%{gh_owner}/laminas-mvc-plugin-fileprg) < 2) +Requires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) >= 1.3 with php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) < 2) +Requires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-identity) >= 1.2 with php-autoloader(%{gh_owner}/laminas-mvc-plugin-identity) < 2) +Requires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-prg) >= 1.3 with php-autoloader(%{gh_owner}/laminas-mvc-plugin-prg) < 2) +# Required for compat layer Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) -# remirepo:6 +# remirepo:7 %else Requires: php-laminas-mvc-plugin-fileprg Requires: php-laminas-mvc-plugin-flashmessenger @@ -69,8 +67,8 @@ Requires: php-laminas-zendframework-bridge %endif # Compatibily ensure by the bridge -Obsoletes: php-zendframework-%{zf_name} < 1.0.1-99 -Provides: php-zendframework-%{zf_name} = %{version}-99 +Obsoletes: php-zendframework-%{zf_name} < 1.0.2 +Provides: php-zendframework-%{zf_name} = %{version} Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} Provides: php-composer(zendframework/%{zf_name}) = %{version} Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version} @@ -150,7 +148,14 @@ exit (class_exists("\\Zend\\%{library}\\%{subproj}\\FilePrg\\Module") ? 0 : 1); %changelog -* Wed Jan 15 2020 Remi Collet - 1.0.0-1 +* Mon May 31 2021 Remi Collet - 1.1.0-1 +- update to 1.1.0 (no change) +- raise dependency on laminas-mvc-plugin-fileprg 1.2 +- raise dependency on laminas-mvc-plugin-flashmessenger 1.3 +- raise dependency on laminas-mvc-plugin-identity 1.2 +- raise dependency on laminas-mvc-plugin-prg 1.3 + +* Wed Jan 15 2020 Remi Collet - 1.0.1-1 - switch to Laminas - use range dependencies -- cgit