rpms/munin/devel munin-1.4.2-fontfix.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 munin.spec, 1.31, 1.32 sources, 1.6, 1.7

[Ingvar Hagelund]

Author: ingvar

Update of /cvs/pkgs/rpms/munin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2138

Modified Files:
	.cvsignore munin.spec sources 
Added Files:
	munin-1.4.2-fontfix.patch 
Log Message:
- New upstream release
- Removed upstream packaged fonts
- Added a patch that makes rrdtool use the system bitstream vera fonts on
  rhel < 6 and fedora < 11


munin-1.4.2-fontfix.patch:
 GraphOld.pm |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE munin-1.4.2-fontfix.patch ---
diff -aur ../munin-1.4.2.orig/master/lib/Munin/Master/GraphOld.pm ./master/lib/Munin/Master/GraphOld.pm
--- ../munin-1.4.2.orig/master/lib/Munin/Master/GraphOld.pm	2009-12-16 15:53:28.000000000 +0100
+++ ./master/lib/Munin/Master/GraphOld.pm	2009-12-17 11:22:44.753518725 +0100
@@ -1299,9 +1299,9 @@
 	# The RRD 1.2 documentation says you can identify font family
 	# names but I never got that to work, but full font path worked
 	return (
-		'--font', "LEGEND:7:$libdir/DejaVuSansMono.ttf",
-		'--font', "UNIT:7:$libdir/DejaVuSans.ttf",
-		'--font', "AXIS:7:$libdir/DejaVuSans.ttf",
+		'--font', "LEGEND:7:/usr/share/fonts/bitstream-vera/VeraMono.ttf",
+		'--font', "UNIT:7:/usr/share/fonts/bitstream-vera/VeraMono.ttf",
+		'--font', "AXIS:7:/usr/share/fonts/bitstream-vera/VeraMono.ttf",
 	       );
     } elsif ($RRDs::VERSION >= 1.3) {
 	# RRD 1.3 and up


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/munin/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	4 Dec 2009 20:24:07 -0000	1.6
+++ .cvsignore	17 Dec 2009 11:31:26 -0000	1.7
@@ -1 +1 @@
-munin-1.4.1.tar.gz
+munin-1.4.2.tar.gz


Index: munin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munin/devel/munin.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- munin.spec	11 Dec 2009 13:53:39 -0000	1.31
+++ munin.spec	17 Dec 2009 11:31:26 -0000	1.32
@@ -1,6 +1,6 @@
 Name:      munin
-Version:   1.4.1
-Release:   3%{?dist}
+Version:   1.4.2
+Release:   1%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
 Group:     System Environment/Daemons
@@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0: http://downloads.sourceforge.net/sourceforge/munin/%{name}-%{version}.tar.gz
 
 Patch1: munin-1.4.0-config.patch
-Patch2: munin-1.4.1-fontfix.patch
+Patch2: munin-1.4.2-fontfix.patch
 
 Source1: munin-1.2.4-sendmail-config
 Source2: munin-1.2.5-hddtemp_smartctl-config
@@ -121,7 +121,9 @@ java-plugins for munin-node. 
 %prep
 %setup -q
 %patch1 -p1
+%if 0%{?rhel} < 6 && 0%{?fedora} < 11
 %patch2 -p0
+%endif
 
 %build
 %if 0%{?rhel} > 4 || 0%{?fedora} > 6
@@ -184,13 +186,9 @@ install -m 0644 %{SOURCE4} %{buildroot}/
 # install config for postfix under fedora
 install -m 0644 %{SOURCE6} %{buildroot}/etc/munin/plugin-conf.d/postfix
 
-# Use font from bitstream-vera-fonts-sans-mono
-rm -f $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
-%if 0%{?rhel} > 5 || 0%{?fedora} > 6
-ln -s /usr/share/fonts/dejavu/DejaVuSansMono.ttf $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
-%else
-ln -s /usr/share/fonts/bitstream-vera/VeraMono.ttf $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
-%endif 
+# Use system font
+rm -f $RPM_BUILD_ROOT/%{_datadir}/munin/DejaVuSansMono.ttf
+rm -f $RPM_BUILD_ROOT/%{_datadir}/munin/DejaVuSans.ttf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -234,7 +232,6 @@ exit 0
 %{_datadir}/munin/munin-html
 %{_datadir}/munin/munin-limits
 %{_datadir}/munin/munin-update
-%{_datadir}/munin/VeraMono.ttf
 %{perl_vendorlib}/Munin/Master
 %dir /etc/munin/templates
 %dir /etc/munin
@@ -289,6 +286,12 @@ exit 0
 %endif
 
 %changelog
+* Thu Dec 17 2009 Ingvar Hagelund <ingvar at linpro.no> - 1.4.2-1
+- New upstream release
+- Removed upstream packaged fonts
+- Added a patch that makes rrdtool use the system bitstream vera fonts on 
+  rhel < 6 and fedora < 11
+
 * Fri Dec 11 2009 Ingvar Hagelund <ingvar at linpro.no> - 1.4.1-3
 - More correct fedora and el versions for previous font path fix
 - Added a patch that fixes a quoting bug in GraphOld.pm, fixing fonts on el4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/munin/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	4 Dec 2009 20:24:07 -0000	1.6
+++ sources	17 Dec 2009 11:31:26 -0000	1.7
@@ -1 +1 @@
-04086f23b657e05e4e5e5a8fa6082f16  munin-1.4.1.tar.gz
+656f0b25af119841b610cac9682d7e54  munin-1.4.2.tar.gz