summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json7
-rw-r--r--php-laminas-navigation.spec16
2 files changed, 13 insertions, 10 deletions
diff --git a/composer.json b/composer.json
index 6068928..e0df8eb 100644
--- a/composer.json
+++ b/composer.json
@@ -26,8 +26,7 @@
},
"require": {
"php": "^7.3 || ~8.0.0",
- "laminas/laminas-stdlib": "^2.7 || ^3.0",
- "laminas/laminas-zendframework-bridge": "^1.0"
+ "laminas/laminas-stdlib": "^2.7 || ^3.0"
},
"require-dev": {
"laminas/laminas-coding-standard": "~1.0.0",
@@ -72,7 +71,7 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
- "replace": {
- "zendframework/zend-navigation": "^2.9.1"
+ "conflict": {
+ "zendframework/zend-navigation": "*"
}
}
diff --git a/php-laminas-navigation.spec b/php-laminas-navigation.spec
index f8e0374..ac0c679 100644
--- a/php-laminas-navigation.spec
+++ b/php-laminas-navigation.spec
@@ -8,7 +8,7 @@
#
# when build without permission-acl
%global bootstrap 0
-%global gh_commit d09bdec77ff06dc44db69209cf1dfcef1064b766
+%global gh_commit 1d29047b49ea978756e6f10921ec3e96f5bc6147
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-navigation
@@ -19,7 +19,7 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-%{gh_project}
-Version: 2.11.1
+Version: 2.12.0
Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component
@@ -94,8 +94,7 @@ BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
# "php": "^7.3 || ~8.0.0",
-# "laminas/laminas-stdlib": "^2.7 || ^3.0",
-# "laminas/laminas-zendframework-bridge": "^1.0"
+# "laminas/laminas-stdlib": "^2.7 || ^3.0"
Requires: php(language) >= 7.3
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
@@ -128,8 +127,8 @@ Requires: php-spl
Obsoletes: php-ZendFramework2-%{library} < 2.5
Provides: php-ZendFramework2-%{library} = %{version}
# Compatibily ensure by the bridge
-Obsoletes: php-zendframework-%{zf_name} < 2.9.1-99
-Provides: php-zendframework-%{zf_name} = %{version}-99
+Obsoletes: php-zendframework-%{zf_name} < 2.10
+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}
@@ -243,6 +242,11 @@ exit $ret
%changelog
+* Tue Dec 7 2021 Remi Collet <remi@remirepo.net> - 2.12.0-1
+- update to 2.12.0
+- keep compatibility using laminas-zendframework-bridge
+ as this is only used using compat autolader
+
* Tue Apr 13 2021 Remi Collet <remi@remirepo.net> - 2.11.1-1
- update to 2.11.1 (no change)