From 0a01a168bb88deb085d9f1443ad520520a78494a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 11 May 2020 17:12:36 +0200
Subject: update to 3.4.1

---
 composer.json                   |  2 +-
 php-laminas-servicemanager.spec | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 505a126..7d02e3e 100644
--- a/composer.json
+++ b/composer.json
@@ -78,6 +78,6 @@
         "upload-coverage": "coveralls -v"
     },
     "replace": {
-        "zendframework/zend-servicemanager": "self.version"
+        "zendframework/zend-servicemanager": "^3.4.0"
     }
 }
diff --git a/php-laminas-servicemanager.spec b/php-laminas-servicemanager.spec
index f391379..fb344bd 100644
--- a/php-laminas-servicemanager.spec
+++ b/php-laminas-servicemanager.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    044cb8e380682563fb277ed5f6de4f690e4e6239
+%global gh_commit    0d4c8628a71fae9f7bd0b1b74b76382e5e9a04b1
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-servicemanager
@@ -22,8 +22,8 @@
 %endif
 
 Name:           php-%{gh_project}
-Version:        3.4.0
-Release:        2%{?dist}
+Version:        3.4.1
+Release:        1%{?dist}
 Summary:        Laminas Framework %{library} component
 
 License:        BSD
@@ -31,8 +31,6 @@ URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
 Source1:        makesrc.sh
 
-Patch0:         https://patch-diff.githubusercontent.com/raw/laminas/laminas-servicemanager/pull/28.patch
-
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
@@ -120,8 +118,8 @@ Requires:       php-composer(fedora/autoloader)
 Obsoletes:      php-ZendFramework2-%{library}             < 2.5
 Provides:       php-ZendFramework2-%{library}             = %{version}
 # Compatibily ensure by the bridge
-Obsoletes:      php-zendframework-%{zf_name}              < 3.4.0-99
-Provides:       php-zendframework-%{zf_name}              = %{version}-99
+Obsoletes:      php-zendframework-%{zf_name}              < 3.4.1
+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}
@@ -140,7 +138,7 @@ Documentation: https://docs.laminas.dev/%{gh_project}/
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1
+
 mv LICENSE.md LICENSE
 
 
@@ -191,7 +189,7 @@ require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php';
 EOF
 
 ret=0
-for cmd in php php72 php73 php74; do
+for cmd in php php72 php73 php74 php80; do
   if which $cmd; then
     $cmd %{_bindir}/phpunit6 --verbose || ret=1
   fi
@@ -220,6 +218,9 @@ exit $ret
 
 
 %changelog
+* Mon May 11 2020 Remi Collet <remi@remirepo.net> - 3.4.1-1
+- update to 3.4.1
+
 * Fri Jan 17 2020 Remi Collet <remi@remirepo.net> - 3.4.0-2
 - cleanup
 
-- 
cgit