diff options
| author | Remi Collet <remi@remirepo.net> | 2021-12-07 15:58:39 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2021-12-07 15:58:39 +0100 |
| commit | c1e41dcea29a3cd8be6015ecca3d4369f65f49dd (patch) | |
| tree | e42e7296004d38741863b1d026948dae26db7b10 | |
| parent | 6a4fe963f508757fb3c6ef893bc843ba5f745c03 (diff) | |
| -rw-r--r-- | composer.json | 4 | ||||
| -rw-r--r-- | php-laminas-mvc-plugins.spec | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/composer.json b/composer.json index 6cc12ad..78480d4 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "laminas/laminas-mvc-plugin-identity": "^1.2", "laminas/laminas-mvc-plugin-prg": "^1.3" }, - "replace": { - "zendframework/zend-mvc-plugins": "^1.0.1" + "conflict": { + "zendframework/zend-mvc-plugins": "*" } } diff --git a/php-laminas-mvc-plugins.spec b/php-laminas-mvc-plugins.spec index 9e9ed98..3453b0b 100644 --- a/php-laminas-mvc-plugins.spec +++ b/php-laminas-mvc-plugins.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit d127f94f258f9d4ae1a3fa233bead2110cd538a9 +%global gh_commit ea91854e410fcf0451c8bc53062da215605cf5ad %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.1.0 +Version: 1.2.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library}/%{subproj} component @@ -148,6 +148,9 @@ exit (class_exists("\\Zend\\%{library}\\%{subproj}\\FilePrg\\Module") ? 0 : 1); %changelog +* Tue Dec 7 2021 Remi Collet <remi@remirepo.net> - 1.2.0-1 +- update to 1.2.0 (no change) + * Mon May 31 2021 Remi Collet <remi@remirepo.net> - 1.1.0-1 - update to 1.1.0 (no change) - raise dependency on laminas-mvc-plugin-fileprg 1.2 |