diff options
| -rw-r--r-- | glpi-fedora-autoloader.php | 6 | ||||
| -rw-r--r-- | glpi.spec | 5 |
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" @@ -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 |