summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json11
-rw-r--r--php-laminas-mvc-form.spec28
2 files changed, 19 insertions, 20 deletions
diff --git a/composer.json b/composer.json
index b564131..a7b593a 100644
--- a/composer.json
+++ b/composer.json
@@ -25,14 +25,9 @@
}
},
"require": {
- "php": "^7.3 || ~8.0.0",
- "laminas/laminas-code": "^3.5.0",
- "laminas/laminas-form": "^2.16.3",
- "laminas/laminas-i18n": "^2.11.1",
- "laminas/laminas-zendframework-bridge": "^1.2.0"
- },
- "conflict": {
- "laminas/laminas-code": "<3.5.0 || >=4.0.0"
+ "laminas/laminas-code": "^3.5.1",
+ "laminas/laminas-form": "^2.17.0",
+ "laminas/laminas-i18n": "^2.11.1"
},
"replace": {
"zendframework/zend-mvc-form": "^1.0.0"
diff --git a/php-laminas-mvc-form.spec b/php-laminas-mvc-form.spec
index b534ab9..d10d185 100644
--- a/php-laminas-mvc-form.spec
+++ b/php-laminas-mvc-form.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit c027f5becb817736096d0967c5e42cd7f746d5e4
+%global gh_commit 9e03ded7e7605a5b1e34a2f187b14d7fd4f1e44f
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-mvc-form
@@ -17,7 +17,7 @@
%global subproj Form
Name: php-%{gh_project}
-Version: 1.1.0
+Version: 1.2.0
Release: 1%{?dist}
Summary: %{namespace} Framework %{library}/%{subproj} component
@@ -30,9 +30,9 @@ BuildArch: noarch
BuildRequires: php-cli
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-code) >= 3.5 with php-autoloader(%{gh_owner}/laminas-code) < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-form) >= 2.16 with php-autoloader(%{gh_owner}/laminas-form) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.11 with php-autoloader(%{gh_owner}/laminas-i18n) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-code) >= 3.5.1 with php-autoloader(%{gh_owner}/laminas-code) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-form) >= 2.17.0 with php-autoloader(%{gh_owner}/laminas-form) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.11.1 with php-autoloader(%{gh_owner}/laminas-i18n) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.2 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
# remirepo:6
%else
@@ -44,16 +44,15 @@ BuildRequires: php-laminas-zendframework-bridge
# From composer, "require": {
# "php": "^7.3 || ~8.0.0",
-# "laminas/laminas-code": "^3.5.0",
-# "laminas/laminas-form": "^2.16.3",
-# "laminas/laminas-i18n": "^2.11.1",
-# "laminas/laminas-zendframework-bridge": "^1.2.0"
+# "laminas/laminas-code": "^3.5.1",
+# "laminas/laminas-form": "^2.17.0",
+# "laminas/laminas-i18n": "^2.11.1"
Requires: php(language) >= 7.3
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-autoloader(%{gh_owner}/laminas-code) >= 3.5 with php-autoloader(%{gh_owner}/laminas-code) < 4)
-Requires: (php-autoloader(%{gh_owner}/laminas-form) >= 2.16 with php-autoloader(%{gh_owner}/laminas-form) < 3)
-Requires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.11 with php-autoloader(%{gh_owner}/laminas-i18n) < 3)
+Requires: (php-autoloader(%{gh_owner}/laminas-code) >= 3.5.1 with php-autoloader(%{gh_owner}/laminas-code) < 4)
+Requires: (php-autoloader(%{gh_owner}/laminas-form) >= 2.17.0 with php-autoloader(%{gh_owner}/laminas-form) < 3)
+Requires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.11.1 with php-autoloader(%{gh_owner}/laminas-i18n) < 3)
Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.2 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
# remirepo:6
%else
@@ -154,6 +153,11 @@ exit (class_exists("\\Zend\\Form\\Factory") ? 0 : 1);
%changelog
+* Mon Oct 11 2021 Remi Collet <remi@remirepo.net> - 1.2.0-1
+- update to 1.2.0 (no change)
+- keep compatibility using laminas-zendframework-bridge
+ as this is only used using compat autolader
+
* Mon May 3 2021 Remi Collet <remi@remirepo.net> - 1.1.0-1
- update to 1.1.0
- raise dependency on PHP 7.3