From 321874fff05ac1fb6ed6bd584799ac60a1cde681 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 3 Jun 2015 16:23:07 +0200 Subject: GLPI: switch from eZ component to Zeta component --- glpi-0.85-config_path.php | 2 +- glpi-dev.spec | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/glpi-0.85-config_path.php b/glpi-0.85-config_path.php index 1085cf1..f924707 100644 --- a/glpi-0.85-config_path.php +++ b/glpi-0.85-config_path.php @@ -23,7 +23,7 @@ define('GLPI_LOG_DIR', '/var/log/glpi'); // System libraries define('GLPI_PHPMAILER_DIR', 'PHPMailer'); -define('GLPI_EZC_BASE', 'ezc/Base/base.php'); +define('GLPI_EZC_BASE', '/usr/share/php/ezc/Base/base.php'); define('GLPI_PHPCAS', 'CAS.php'); define('GLPI_HTMLAWED', 'htmLawed/htmLawed.php'); define('GLPI_ZEND_PATH', '/usr/share/php/Zend'); diff --git a/glpi-dev.spec b/glpi-dev.spec index c912ff0..796c941 100644 --- a/glpi-dev.spec +++ b/glpi-dev.spec @@ -28,7 +28,7 @@ Name: glpi Version: 0.85.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -86,7 +86,7 @@ Requires: php-ZendFramework2-ServiceManager Requires: php-ZendFramework2-Stdlib Requires: php-ZendFramework2-Version %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 -Requires: php-pear(components.ez.no/Graph) >= 1.5 +Requires: php-composer(zetacomponents/graph) Requires: gnu-free-sans-fonts %else Requires: freefont @@ -138,7 +138,9 @@ rm -rf lib/htmlawed rm -rf lib/Zend rm -rf lib/simplepie rm -rf lib/tcpdf +%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 rm -rf lib/ezcomponents +%endif %if 0%{?fedora} < 9 && 0%{?rhel} < 6 # fix font path on old version @@ -312,6 +314,9 @@ fi %changelog +* Wed Jun 3 2015 Remi Collet - 0.85.4-2 +- switch from eZ component to Zeta component + * Mon May 4 2015 Remi Collet - 0.85.4-1 - update to 0.85.4 https://forge.indepnet.net/versions/1136 -- cgit