summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2017-01-29 06:33:06 +0100
committerRemi Collet <fedora@famillecollet.com>2017-01-29 06:33:06 +0100
commitf65beaf805eadc9afe7e9e2f187c958a95a86927 (patch)
treea9b4b5dddb851af5089066822572f60b8ce1be98
parenta42e6b918f69dc72c1eff9f59417101f8d23e8e6 (diff)
glpi: fix autoloader for sabre/dav
-rw-r--r--glpi-fedora-autoloader.php6
-rw-r--r--glpi.spec5
2 files changed, 9 insertions, 2 deletions
diff --git a/glpi-fedora-autoloader.php b/glpi-fedora-autoloader.php
index 6482af4..128d592 100644
--- a/glpi-fedora-autoloader.php
+++ b/glpi-fedora-autoloader.php
@@ -12,7 +12,11 @@ require_once $vendor . '/php-iamcal-lib-autolink/autoload.php';
// "phpmailer/phpmailer"
require_once $vendor . '/PHPMailer/PHPMailerAutoload.php';
// "sabre/vobject"
-require_once $vendor . '/Sabre/VObject/autoload.php';
+if (file_exists($vendor . '/Sabre/VObject4/autoload.php')) {
+ require_once $vendor . '/Sabre/VObject4/autoload.php';
+} else {
+ require_once $vendor . '/Sabre/VObject/autoload.php';
+}
// "simplepie/simplepie"
require_once $vendor . '/php-simplepie/autoloader.php';
// "tecnickcom/tcpdf"
diff --git a/glpi.spec b/glpi.spec
index 5505629..997e6c9 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -44,7 +44,7 @@
Name: %{gh_project}
Version: 9.1.2
%global schema 9.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Free IT asset management software
Summary(fr): Gestion Libre de Parc Informatique
@@ -462,6 +462,9 @@ fi
%changelog
+* Sun Jan 29 2017 Remi Collet <remi@fedoraproject.org> - 9.1.2-2
+- fix autoloader to allow sabre/vobject version 4
+
* Mon Jan 23 2017 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 9.1.2-1
- update to 9.1.2
- add missing hostname BR from MariaDB package