summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-07-01 18:53:42 +0200
committerRemi Collet <remi@remirepo.net>2019-07-01 18:53:42 +0200
commitcbc33625a95842bf5980894942a3b7c49d33ec36 (patch)
tree4d79394807ea76b2e764d73b5516312bc39af1e3
parentebfffec3ebedaebd2f49a18fafeca09470eb51c1 (diff)
change autoloader order to ensure same versions are used
-rw-r--r--php-sabre-dav-autoload.php4
-rw-r--r--php-sabre-dav.spec8
2 files changed, 8 insertions, 4 deletions
diff --git a/php-sabre-dav-autoload.php b/php-sabre-dav-autoload.php
index edbbc4d..a7fd77f 100644
--- a/php-sabre-dav-autoload.php
+++ b/php-sabre-dav-autoload.php
@@ -10,10 +10,10 @@ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Dependencies::required([
'/usr/share/php/Sabre/Event/autoload.php',
- '/usr/share/php/Sabre/HTTP/autoload.php',
- '/usr/share/php/Sabre/VObject4/autoload.php',
'/usr/share/php/Sabre/Xml/autoload.php',
'/usr/share/php/Sabre/Uri/autoload.php',
+ '/usr/share/php/Sabre/HTTP/autoload.php',
+ '/usr/share/php/Sabre/VObject4/autoload.php',
'/usr/share/php/Psr/Log/autoload.php',
]);
diff --git a/php-sabre-dav.spec b/php-sabre-dav.spec
index f3abfd6..220592b 100644
--- a/php-sabre-dav.spec
+++ b/php-sabre-dav.spec
@@ -19,7 +19,7 @@
Name: php-sabre-%{gh_project}
Summary: WebDAV Framework for PHP
Version: 3.2.3
-Release: 1%{?dist}
+Release: 3%{?dist}
URL: https://github.com/%{gh_owner}/%{gh_project}
License: BSD
@@ -194,7 +194,7 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php
: Run upstream test suite against installed library
ret=0
-for cmd in php php70 php71 php72 php73; do
+for cmd in php php71 php72 php73 php74; do
if which $cmd; then
$cmd %{_bindir}/phpunit \
--filter '^((?!(testRequireAuth)).)*$' \
@@ -208,6 +208,7 @@ exit $ret
%files
+# remirepo:1
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc *md
@@ -220,6 +221,9 @@ exit $ret
%changelog
+* Mon Jul 1 2019 Remi Collet <remi@remirepo.net> - 3.2.3-3
+- change autoloader order to ensure same versions are used
+
* Wed Jan 9 2019 Remi Collet <remi@remirepo.net> - 3.2.3-1
- update to 3.2.3