From b9b37c7dba92ca6bd946f2c88181d378ccd64d47 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 17 Jan 2020 15:22:08 +0100
Subject: cleanup

---
 php-laminas-tag.spec | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/php-laminas-tag.spec b/php-laminas-tag.spec
index 2f391a4..bfad7f4 100644
--- a/php-laminas-tag.spec
+++ b/php-laminas-tag.spec
@@ -23,7 +23,7 @@
 
 Name:           php-%{gh_project}
 Version:        2.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        %{namespace} Framework %{library} component
 
 License:        BSD
@@ -66,28 +66,29 @@ BuildRequires:  php-fedora-autoloader-devel
 #        "laminas/laminas-stdlib": "^2.7 || ^3.0",
 #        "laminas/laminas-zendframework-bridge": "^1.0"
 Requires:       php(language) >= 5.6
-%if ! %{bootstrap}
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:      (php-autoloader(%{gh_owner}/laminas-escaper)              >= 2.5   with php-autoloader(%{gh_owner}/laminas-escaper)              < 3)
 Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.0   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": {
+#        "laminas/laminas-servicemanager": "Laminas\\ServiceManager component"
+Suggests:       php-autoloader(%{gh_owner}/laminas-servicemanager)
 # remirepo:5
 %else
 Requires:       php-laminas-escaper
 Requires:       php-laminas-stdlib
 Requires:       php-laminas-zendframework-bridge
 %endif
-# From composer, "suggest": {
-#        "laminas/laminas-servicemanager": "Laminas\\ServiceManager component"
-Suggests:       php-autoloader(%{gh_owner}/laminas-servicemanager)
-%endif
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
 # From phpcompatinfo report for version 2.7.1
 Requires:       php-pcre
 Requires:       php-spl
 
+# remirepo:2
+Obsoletes:      php-ZendFramework2-%{library}             < 2.5
+Provides:       php-ZendFramework2-%{library}             = %{version}
 # Compatibily ensure by the bridge
 Obsoletes:      php-zendframework-%{zf_name}              < 2.7.1-99
 Provides:       php-zendframework-%{zf_name}              = %{version}-99
@@ -166,7 +167,7 @@ done
 : check compat autoloader
 php -r '
 require "%{buildroot}%{php_home}/Zend/%{library}/autoload.php";
-return (class_exists("\\Zend\\%{library}\\Query") ? 0 : 1);
+exit (class_exists("\\Zend\\%{library}\\Item") ? 0 : 1);
 '
 
 exit $ret
@@ -186,6 +187,9 @@ exit $ret
 
 
 %changelog
+* Fri Jan 17 2020 Remi Collet <remi@remirepo.net> - 2.7.2-2
+- cleanup
+
 * Wed Jan  8 2020 Remi Collet <remi@remirepo.net> - 2.7.2-1
 - switch to Laminas
 
-- 
cgit