drop dependency on container-interop/container-interop

  replaced by servicemanager >= 3.12

1 files changed, 12 insertions, 13 deletions

diff --git a/php-laminas-router.spec b/php-laminas-router.spec
index 8a15be1..c574073 100644
--- a/php-laminas-router.spec
+++ b/php-laminas-router.spec
@@ -1,6 +1,6 @@
 # remirepo/Fedora spec file for php-laminas-router
 #
-# Copyright (c) 2016-2021 Remi Collet
+# Copyright (c) 2016-2022 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -23,7 +23,7 @@
 
 Name:           php-%{gh_project}
 Version:        3.5.0
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        %{namespace} Framework %{library} component
 
 License:        BSD
@@ -39,9 +39,8 @@ BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(container-interop/container-interop)        >= 1.2    with php-composer(container-interop/container-interop)        < 2)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-http)                 >= 2.15   with php-autoloader(%{gh_owner}/laminas-http)                 < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.7    with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.12   with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.6    with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0    with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
 # From composer, "require-dev": {
@@ -51,9 +50,8 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0
 #        "psalm/plugin-phpunit": "^0.15.1",
 #        "vimeo/psalm": "^4.7"
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n)                 >= 2.6    with php-autoloader(%{gh_owner}/laminas-i18n)                 < 3)
-# remirepo:8
+# remirepo:7
 %else
-BuildRequires:  php-container-interop
 BuildRequires:  php-laminas-http
 BuildRequires:  php-laminas-servicemanager
 BuildRequires:  php-laminas-stdlib
@@ -76,17 +74,15 @@ Requires:       php(language) >= 7.3
 %if ! %{bootstrap}
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-composer(container-interop/container-interop)        >= 1.2    with php-composer(container-interop/container-interop)        < 2)
 Requires:      (php-autoloader(%{gh_owner}/laminas-http)                 >= 2.15   with php-autoloader(%{gh_owner}/laminas-http)                 < 3)
-Requires:      (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.7    with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
+Requires:      (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.12   with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
 Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.6    with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
 Requires:      (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0    with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
 # From composer, "suggest": {
 #        "zendframework/zend-i18n": "^2.6, if defining translatable HTTP path segments"
 Suggests:       php-autoloader(%{gh_owner}/laminas-i18n)
-# remirepo:7
+# remirepo:6
 %else
-Requires:       php-container-interop
 Requires:       php-laminas-http
 Requires:       php-laminas-servicemanager
 Requires:       php-laminas-stdlib
@@ -142,9 +138,8 @@ mv LICENSE.md LICENSE
 phpab --template fedora --output src/autoload.php src
 cat << 'EOF' | tee -a src/autoload.php
 \Fedora\Autoloader\Dependencies::required([
-    '%{php_home}/Interop/Container/autoload.php',
-    '%{php_home}/%{namespace}/Http/autoload.php',
     '%{php_home}/%{namespace}/ServiceManager/autoload.php',
+    '%{php_home}/%{namespace}/Http/autoload.php',
     '%{php_home}/%{namespace}/Stdlib/autoload.php',
 ]);
 \Fedora\Autoloader\Dependencies::optional([
@@ -189,7 +184,7 @@ exit (class_exists("\\Zend\\%{library}\\RouterFactory") ? 0 : 1);
 
 : upstream test suite
 ret=0
-for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do
+for cmdarg in "php %{phpunit}" php74 php80 php81; do
   if which $cmdarg; then
     set $cmdarg
     $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit9} --verbose || ret=1
@@ -212,6 +207,10 @@ exit $ret
 
 
 %changelog
+* Thu Jun 23 2022 Remi Collet <remi@remirepo.net> - 3.5.0-3
+- drop dependency on container-interop/container-interop
+  replaced by servicemanager >= 3.12
+
 * Thu Oct 14 2021 Remi Collet <remi@remirepo.net> - 3.5.0-1
 - update to 3.5.0
 - keep compatibility using laminas-zendframework-bridge