[glpi] use system EZC only if available (not in EL-5)
Remi Collet
remi at fedoraproject.org
Sun Jul 24 07:42:37 UTC 2011
commit 27c6875cb5f25e694bd1570357e0242d31437911
Author: remi <fedora at famillecollet.com>
Date: Sun Jul 24 09:42:20 2011 +0200
use system EZC only if available (not in EL-5)
glpi.spec | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/glpi.spec b/glpi.spec
index 27a0899..09dc8d0 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -9,7 +9,7 @@
Name: glpi
Version: 0.78.5
%if 0%{?svnrelease}
-Release: 2.svn%{svnrelease}%{?dist}
+Release: 3.svn%{svnrelease}%{?dist}
%else
Release: 1%{?dist}
%endif
@@ -42,8 +42,8 @@ Requires: php >= 5.0.0, php-mysql, httpd, php-gd, php-ldap, php-imap, php-
Requires: php-pear(Cache_Lite) >= 1.7.4
Requires: php-PHPMailer
Requires: php-pear-CAS >= 1.1.0
-Requires: php-pear(components.ez.no/Graph) >= 1.5
%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+Requires: php-pear(components.ez.no/Graph) >= 1.5
Requires: gnu-free-sans-fonts
%else
Requires: freefont
@@ -87,13 +87,15 @@ find install -name \*.orig -exec rm {} \; -print
rm -rf lib/cache_lite
rm -rf lib/phpmailer
rm -rf lib/phpcas
-rm -rf lib/ezcomponents
%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+rm -rf lib/ezcomponents
cp %{SOURCE2} config/config_path.php
%else
# fix font path on old version
-sed -e /GLPI_FONT_FREESANS/s/gnu-free/freefont/ %{SOURCE2} >config/config_path.php
+sed -e '/GLPI_FONT_FREESANS/s/gnu-free/freefont/' \
+ -e '/GLPI_EZC_BASE/d' \
+ %{SOURCE2} >config/config_path.php
%endif
mv lib/tiny_mce/license.txt LICENSE.tiny_mce
@@ -245,6 +247,9 @@ fi
%changelog
+* Sun Jul 24 2011 Remi Collet <Fedora at FamilleCollet.com> - 0.78.5-3.svn14966
+- use system EZC only if available (not in EL-5)
+
* Fri Jul 22 2011 Remi Collet <Fedora at FamilleCollet.com> - 0.78.5-2.svn14966
- bug and security fix from SVN.
More information about the scm-commits
mailing list