rpms/munin/FC-5 munin-1.2.4-conf.patch, NONE, 1.1 munin-1.2.4-cron.patch, NONE, 1.1 munin.spec, 1.6, 1.7

[Kevin Fenzi (kevin)]

Author: kevin

Update of /cvs/extras/rpms/munin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22346

Modified Files:
	munin.spec 
Added Files:
	munin-1.2.4-conf.patch munin-1.2.4-cron.patch 
Log Message:
add patch to remove unneeded munin-nagios in cron.
add patch to remove buildhostname in munin.conf (fixes #188928)
clean up prep section of spec.


munin-1.2.4-conf.patch:

--- NEW FILE munin-1.2.4-conf.patch ---
diff -Nur munin-1.2.4.orig/server/munin.conf.in munin-1.2.4/server/munin.conf.in
--- munin-1.2.4.orig/server/munin.conf.in	2005-10-08 04:11:02.000000000 -0600
+++ munin-1.2.4/server/munin.conf.in	2006-04-22 14:17:46.000000000 -0600
@@ -24,7 +24,7 @@
 #contact.nagios.command /usr/sbin/send_nsca -H nagios.host.com -c /etc/send_nsca.cfg
 
 # a simple host tree
-[@@HOSTNAME@@]
+[localhost]
     address 127.0.0.1
     use_node_name yes
 

munin-1.2.4-cron.patch:

--- NEW FILE munin-1.2.4-cron.patch ---
diff -Nur munin-1.2.4.orig/dists/redhat/munin.cron.d munin-1.2.4/dists/redhat/munin.cron.d
--- munin-1.2.4.orig/dists/redhat/munin.cron.d	2005-10-08 04:11:01.000000000 -0600
+++ munin-1.2.4/dists/redhat/munin.cron.d	2006-04-22 14:10:48.000000000 -0600
@@ -5,4 +5,3 @@
 MAILTO=root
 
 */5 * * * *     munin test -x /usr/bin/munin-cron && /usr/bin/munin-cron
-10 10 * * *     munin test -x /usr/share/munin/munin-nagios && /usr/share/munin/munin-nagios --removeok


Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-5/munin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- munin.spec	24 Feb 2006 18:59:04 -0000	1.6
+++ munin.spec	23 Apr 2006 23:17:15 -0000	1.7
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   7%{?dist}
+Release:   8%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -9,6 +9,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: http://download.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
+Patch0: munin-1.2.4-cron.patch
+Patch1: munin-1.2.4-conf.patch
 BuildArchitectures: noarch
 Requires: perl-HTML-Template
 Requires: perl-Net-Server
@@ -66,8 +68,8 @@
 
 %prep
 %setup -q
-rm -rf %{buildroot}
-mkdir -p %{buildroot}
+%patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -221,6 +223,11 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Sat Apr 22 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-8
+- add patch to remove unneeded munin-nagios in cron. 
+- add patch to remove buildhostname in munin.conf (fixes #188928)
+- clean up prep section of spec. 
+
 * Fri Feb 24 2006 Kevin Fenzi <kevin at scrye.com> - 1.2.4-7
 - Remove bogus Provides for perl RRDs (fixes #182702)