diff options
| -rw-r--r-- | composer.json | 9 | ||||
| -rw-r--r-- | php-laminas-mvc-plugin-flashmessenger.spec | 12 |
2 files changed, 11 insertions, 10 deletions
diff --git a/composer.json b/composer.json index 69bae94..9a01cf0 100644 --- a/composer.json +++ b/composer.json @@ -28,8 +28,7 @@ "laminas/laminas-mvc": "^3.0", "laminas/laminas-session": "^2.8.5", "laminas/laminas-stdlib": "^3.2.1", - "laminas/laminas-view": "^2.12", - "laminas/laminas-zendframework-bridge": "^1.0" + "laminas/laminas-view": "^2.12" }, "require-dev": { "laminas/laminas-coding-standard": "~1.0.0", @@ -37,7 +36,8 @@ "phpunit/phpunit": "^9.3" }, "conflict": { - "laminas/laminas-mvc": "<3.0.0" + "laminas/laminas-mvc": "<3.0.0", + "zendframework/zend-mvc-plugin-flashmessenger": "*" }, "autoload": { "psr-4": { @@ -59,9 +59,6 @@ "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" }, - "replace": { - "zendframework/zend-mvc-plugin-flashmessenger": "^1.2.0" - }, "suggests": { "laminas/laminas-i18n": "Laminas\\I18n component" } diff --git a/php-laminas-mvc-plugin-flashmessenger.spec b/php-laminas-mvc-plugin-flashmessenger.spec index 2d4427a..12d9a06 100644 --- a/php-laminas-mvc-plugin-flashmessenger.spec +++ b/php-laminas-mvc-plugin-flashmessenger.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit d683b79132990b48fc720259337ecd353cba4c43 +%global gh_commit 178339e7eb0e34e220e2fe543832f4eed7fb5705 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-mvc-plugin-flashmessenger @@ -24,7 +24,7 @@ %endif Name: php-%{gh_project} -Version: 1.4.0 +Version: 1.5.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library}/%{subproj}/%{subsubp} component @@ -70,8 +70,7 @@ BuildRequires: php-fedora-autoloader-devel # "laminas/laminas-mvc": "^3.0", # "laminas/laminas-session": "^2.8.5", # "laminas/laminas-stdlib": "^3.2.1", -# "laminas/laminas-view": "^2.12", -# "laminas/laminas-zendframework-bridge": "^1.0" +# "laminas/laminas-view": "^2.12" Requires: php(language) >= 7.3 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -200,6 +199,11 @@ exit $ret %changelog +* Wed Dec 8 2021 Remi Collet <remi@remirepo.net> - 1.5.0-1 +- update to 1.5.0 (no change) +- keep compatibility using laminas-zendframework-bridge + as this is only used using compat autolader + * Wed Dec 1 2021 Remi Collet <remi@remirepo.net> - 1.4.0-1 - update to 1.4.0 |