summaryrefslogtreecommitdiffstats
path: root/php-sabre-xml2.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-07-05 13:12:11 +0200
committerRemi Collet <remi@remirepo.net>2019-07-05 13:12:11 +0200
commit5d245c1c0d347c9aff84d5ac0956a0bcc242a5f6 (patch)
treefbd1b4d4cf3f06c5eed90edca9d14c0791559500 /php-sabre-xml2.spec
parent040de277d9ea94e0d480589afedc72c0994c503b (diff)
fix autoloader for sabre/uri v1 and v2
Diffstat (limited to 'php-sabre-xml2.spec')
-rw-r--r--php-sabre-xml2.spec16
1 files changed, 11 insertions, 5 deletions
diff --git a/php-sabre-xml2.spec b/php-sabre-xml2.spec
index 4094c4b..ddeb09c 100644
--- a/php-sabre-xml2.spec
+++ b/php-sabre-xml2.spec
@@ -23,7 +23,7 @@
Name: php-%{pk_vendor}-%{pk_project}%{major}
Summary: XML library that you may not hate
Version: 2.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: https://github.com/%{gh_owner}/%{gh_project}
License: BSD
@@ -39,7 +39,7 @@ BuildRequires: php-xmlreader
BuildRequires: php-dom
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(sabre/uri) >= 2.0 with php-composer(sabre/uri) < 3)
+BuildRequires: (php-composer(sabre/uri) >= 1.0 with php-composer(sabre/uri) < 3)
# remirepo:3
%else
BuildRequires: php-sabre-uri2
@@ -67,7 +67,7 @@ Requires: php-xmlreader
Requires: php-dom
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(sabre/uri) >= 2.0 with php-composer(sabre/uri) < 3)
+Requires: (php-composer(sabre/uri) >= 1.0 with php-composer(sabre/uri) < 3)
# remirepo:3
%else
Requires: php-sabre-uri2
@@ -96,7 +96,10 @@ cat << 'EOF' | tee -a lib/autoload.php
// Dependencies
\Fedora\Autoloader\Dependencies::required([
- '/usr/share/php/Sabre/Uri2/autoload.php',
+ [
+ '/usr/share/php/Sabre/Uri2/autoload.php',
+ '/usr/share/php/Sabre/Uri/autoload.php',
+ ],
]);
// Functions
@@ -130,7 +133,7 @@ cd tests
ret=0
for cmd in php php71 php72 php73 php74; do
if which $cmd; then
- $cmd %{_bindir}/phpunit7 || ret=1
+ $cmd %{_bindir}/phpunit6 || ret=1
fi
done
exit $ret
@@ -149,6 +152,9 @@ exit $ret
%changelog
+* Fri Jul 5 2019 Remi Collet <remi@remirepo.net> - 2.1.2-2
+- fix autoloader for sabre/uri v1 and v2
+
* Mon Jul 1 2019 Remi Collet <remi@remirepo.net> - 2.1.2-1
- update to 2.1.2
- rename to php-sabre-xml2