glpi: fix autoloader for sabre/dav

remicollet · Jan 29, 2017 · 9760f9b · 9760f9b
1 parent babe060
commit 9760f9b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/glpi/glpi/glpi-fedora-autoloader.php b/glpi/glpi/glpi-fedora-autoloader.php
@@ -12,7 +12,11 @@
 // "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/glpi/glpi.spec b/glpi/glpi/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