From 9304ea0f7bf45437021801527621e2171942421d Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@fedoraproject.org>
Date: Apr 23 2006 23:06:40 +0000
Subject: 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.

---

diff --git a/munin-1.2.4-conf.patch b/munin-1.2.4-conf.patch
new file mode 100644
index 0000000..35719ad
--- /dev/null
+++ b/munin-1.2.4-conf.patch
@@ -0,0 +1,12 @@
+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
+ 
diff --git a/munin-1.2.4-cron.patch b/munin-1.2.4-cron.patch
new file mode 100644
index 0000000..0f415c6
--- /dev/null
+++ b/munin-1.2.4-cron.patch
@@ -0,0 +1,8 @@
+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
diff --git a/munin.spec b/munin.spec
index 55e8d58..ac4e96a 100644
--- a/munin.spec
+++ b/munin.spec
@@ -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 @@ URL:       http://munin.projects.linpro.no/
 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 @@ RRDtool.
 
 %prep
 %setup -q
-rm -rf %{buildroot}
-mkdir -p %{buildroot}
+%patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -221,6 +223,11 @@ test "$1" != 0 || /usr/sbin/fedora-groupdel munin &>/dev/null || :
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Sat Apr 22 2006 Kevin Fenzi <kevin@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@scrye.com> - 1.2.4-7
 - Remove bogus Provides for perl RRDs (fixes #182702)