From 5ee162c8ca13f8f2bccba731125bec17b6ecdc02 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 5 Jul 2019 13:08:32 +0200
Subject: fix autoloader sabre/uri v1 and v2

---
 php-sabre-xml-autoload.php |  9 ++++++---
 php-sabre-xml.spec         | 11 +++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/php-sabre-xml-autoload.php b/php-sabre-xml-autoload.php
index 460befe..fa32b83 100644
--- a/php-sabre-xml-autoload.php
+++ b/php-sabre-xml-autoload.php
@@ -9,7 +9,10 @@ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
 require_once __DIR__ . '/Deserializer/functions.php';
 require_once __DIR__ . '/Serializer/functions.php';
 
-\Fedora\Autoloader\Dependencies::required(array(
-	'/usr/share/php/Sabre/Uri/autoload.php',
-));
+\Fedora\Autoloader\Dependencies::required([
+	[
+		'/usr/share/php/Sabre/Uri2/autoload.php',
+		'/usr/share/php/Sabre/Uri/autoload.php',
+	],
+]);
 
diff --git a/php-sabre-xml.spec b/php-sabre-xml.spec
index 5d24cd5..09d0088 100644
--- a/php-sabre-xml.spec
+++ b/php-sabre-xml.spec
@@ -15,7 +15,7 @@
 Name:           php-sabre-%{gh_project}
 Summary:        XML library that you may not hate
 Version:        1.5.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 License:        BSD
@@ -30,7 +30,7 @@ BuildRequires:  php-xmlreader
 BuildRequires:  php-dom
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(sabre/uri) >= 1.0   with  php-composer(sabre/uri) <  2)
+BuildRequires: (php-composer(sabre/uri) >= 1.0   with  php-composer(sabre/uri) <  3)
 # remirepo:3
 %else
 BuildRequires:  php-sabre-uri
@@ -48,7 +48,7 @@ BuildRequires:  php-composer(fedora/autoloader)
 # From composer.json, "require" : {
 #        "php" : ">=5.5.5",
 #        "ext-xmlwriter" : "*",
-#        "ext-xmlreader" : "*",
+#        "ext-xmlreader" : "*",array
 #        "ext-dom" : "*",
 #        "lib-libxml" : ">=2.6.20",
 #        "sabre/uri" : ">=1.0,<3.0.0"
@@ -58,7 +58,7 @@ Requires:       php-xmlreader
 Requires:       php-dom
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-composer(sabre/uri) >= 1.0   with  php-composer(sabre/uri) <  2)
+Requires:      (php-composer(sabre/uri) >= 1.0   with  php-composer(sabre/uri) <  3)
 # remirepo:3
 %else
 Requires:       php-sabre-uri
@@ -129,6 +129,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul  5 2019 Remi Collet <remi@remirepo.net> - 1.5.1-4
+- fix autoloader sabre/uri v1 and v2
+
 * Mon Jul  1 2019 Remi Collet <remi@remirepo.net> - 1.5.1-3
 - only sabre/uri v1
 
-- 
cgit