rpms/zabbix/devel zabbix-1.8.2-fonts-config.patch, NONE, 1.1 zabbix-1.8.2-config.patch, 1.1, 1.2 zabbix.spec, 1.57, 1.58

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23547

Modified Files:
	zabbix-1.8.2-config.patch zabbix.spec 
Added Files:
	zabbix-1.8.2-fonts-config.patch 
Log Message:
* Thu Apr 29 2010 Dan Horák <dan[at]danny.cz> - 1.8.2-2
- DejaVu fonts doesn't exist on EL <= 5


zabbix-1.8.2-fonts-config.patch:
 defines.inc.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE zabbix-1.8.2-fonts-config.patch ---
diff -up zabbix-1.8.2/frontends/php/include/defines.inc.php.orig zabbix-1.8.2/frontends/php/include/defines.inc.php
--- zabbix-1.8.2/frontends/php/include/defines.inc.php.orig	2010-03-29 19:22:45.000000000 +0200
+++ zabbix-1.8.2/frontends/php/include/defines.inc.php	2010-03-30 11:16:18.000000000 +0200
@@ -47,7 +47,7 @@
 
 	define('ZBX_POPUP_MAX_ROWS',			20);
 
-	define('ZBX_FONTPATH',					realpath('fonts'));	// where to search for font (GD > 2.0.18)
+	define('ZBX_FONTPATH',					'/usr/share/fonts/dejavu');	// where to search for font (GD > 2.0.18)
 	define('ZBX_GRAPH_FONT_NAME',			'DejaVuSans');		// font file name
 
 	define('ZBX_SCRIPT_TIMEOUT',			360); // in seconds

zabbix-1.8.2-config.patch:
 config.inc.php |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: zabbix-1.8.2-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix-1.8.2-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zabbix-1.8.2-config.patch	30 Mar 2010 09:40:59 -0000	1.1
+++ zabbix-1.8.2-config.patch	29 Apr 2010 15:48:12 -0000	1.2
@@ -11,15 +11,3 @@ diff -up zabbix-1.8.2/frontends/php/incl
  
  	unset($show_setup);
  
-diff -up zabbix-1.8.2/frontends/php/include/defines.inc.php.orig zabbix-1.8.2/frontends/php/include/defines.inc.php
---- zabbix-1.8.2/frontends/php/include/defines.inc.php.orig	2010-03-29 19:22:45.000000000 +0200
-+++ zabbix-1.8.2/frontends/php/include/defines.inc.php	2010-03-30 11:16:18.000000000 +0200
-@@ -47,7 +47,7 @@
- 
- 	define('ZBX_POPUP_MAX_ROWS',			20);
- 
--	define('ZBX_FONTPATH',					realpath('fonts'));	// where to search for font (GD > 2.0.18)
-+	define('ZBX_FONTPATH',					'/usr/share/fonts/dejavu');	// where to search for font (GD > 2.0.18)
- 	define('ZBX_GRAPH_FONT_NAME',			'DejaVuSans');		// font file name
- 
- 	define('ZBX_SCRIPT_TIMEOUT',			360); // in seconds


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- zabbix.spec	30 Mar 2010 09:41:00 -0000	1.57
+++ zabbix.spec	29 Apr 2010 15:48:13 -0000	1.58
@@ -7,7 +7,7 @@
 
 Name:           zabbix
 Version:        1.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -23,6 +23,8 @@ Source5:        zabbix-logrotate.in
 Patch0:         zabbix-1.8.2-config.patch
 # close fd on exec - https://bugzilla.redhat.com/show_bug.cgi?id=559221
 Patch1:         zabbix-1.8.1-cloexec.patch
+# local rules for config files - fonts
+Patch2:         zabbix-1.8.2-fonts-config.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -186,7 +188,10 @@ Requires:        php-gd
 Requires:        php-bcmath
 Requires:        php-mbstring
 Requires:        php-xml
+# DejaVu fonts doesn't exist on EL <= 5
+%if 0%{?fedora} || 0%{?rhel} >= 6
 Requires:        dejavu-sans-fonts
+%endif
 Requires:        zabbix = %{version}-%{release}
 Requires:        zabbix-web-database = %{version}-%{release}
 
@@ -245,8 +250,13 @@ Zabbix web frontend for SQLite
 %patch0 -p1
 %patch1 -p1 -b .cloexec
 
+# DejaVu fonts doesn't exist on EL <= 5
+%if 0%{?fedora} || 0%{?rhel} >= 6
+%patch2 -p1
+
 # remove included fonts
 rm -rf frontends/php/fonts
+%endif
 
 # remove executable permissions
 chmod a-x upgrades/dbpatches/1.8/mysql/upgrade
@@ -577,6 +587,9 @@ fi
 
 
 %changelog
+* Thu Apr 29 2010 Dan Horák <dan[at]danny.cz> - 1.8.2-2
+- DejaVu fonts doesn't exist on EL <= 5
+
 * Tue Mar 30 2010 Dan Horák <dan[at]danny.cz> - 1.8.2-1
 - Update to 1.8.2