[munin] Added patch to fix BZ# 712245

[fenris02]

commit 006ac2225982b3fdf7d551e68150d2068a76b35b
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Wed Jun 15 21:42:10 2011 -0500

    Added patch to fix BZ# 712245

 .gitignore |    1 +
 munin.spec |   39 +++++++++++++++++++++------------------
 sources    |    2 +-
 3 files changed, 23 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5652521..815dec5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ munin-1.4.5.tar.gz
 /munin-1.4.5.tar.gz
 /munin-1.4.5-rundir-conf.patch
 /munin.conf
+/munin-1.4.5-no-such-object.patch
diff --git a/munin.spec b/munin.spec
index 30caf43..6d3ed39 100644
--- a/munin.spec
+++ b/munin.spec
@@ -14,6 +14,7 @@ Patch1: munin-1.4.0-config.patch
 Patch2: munin-1.4.2-fontfix.patch
 Patch3: munin-1.4.5-uppercase.patch
 Patch4: munin-1.4.5-rundir-conf.patch
+Patch5: munin-1.4.5-no-such-object.patch
 
 Source1: munin-1.2.4-sendmail-config
 Source2: munin-1.2.5-hddtemp_smartctl-config
@@ -42,7 +43,7 @@ BuildRequires: mx4j
 BuildRequires: jpackage-utils
 %endif
 
-%if 0%{?rhel} > 6 || 0%{?fedora} > 14
+%if 0%{?rhel} > 6 || 0%{?fedora} > 15
 BuildRequires: systemd-units
 %endif
 
@@ -141,27 +142,28 @@ java-plugins for munin-node.
 %endif
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %if 0%{?rhel} > 4 || 0%{?fedora} > 6
 export  CLASSPATH=plugins/javalib/org/munin/plugin/jmx:$(build-classpath mx4j):$CLASSPATH
 %endif
-make 	CONFIG=dists/redhat/Makefile.config
+make    CONFIG=dists/redhat/Makefile.config
 
 %install
 
 ## Node
-make	CONFIG=dists/redhat/Makefile.config \
+make    CONFIG=dists/redhat/Makefile.config \
 %if 0%{?rhel} > 4 || 0%{?fedora} > 6
-	JAVALIBDIR=%{buildroot}%{_datadir}/java \
+        JAVALIBDIR=%{buildroot}%{_datadir}/java \
 %endif
-	PREFIX=%{buildroot}%{_prefix} \
- 	DOCDIR=%{buildroot}%{_docdir}/%{name}-%{version} \
-	MANDIR=%{buildroot}%{_mandir} \
-	DESTDIR=%{buildroot} \
-	install
+        PREFIX=%{buildroot}%{_prefix} \
+        DOCDIR=%{buildroot}%{_docdir}/%{name}-%{version} \
+        MANDIR=%{buildroot}%{_mandir} \
+        DESTDIR=%{buildroot} \
+        install
 
-%if 0%{?rhel} > 6 || 0%{?fedora} > 14
+%if 0%{?rhel} > 6 || 0%{?fedora} > 15
 mkdir -p %{buildroot}/lib/systemd/system/
 mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
 %else
@@ -178,7 +180,7 @@ mkdir -p %{buildroot}/var/log/munin
 #
 # don't enable munin-node by default.
 #
-%if 0%{?rhel} > 6 || 0%{?fedora} > 14
+%if 0%{?rhel} > 6 || 0%{?fedora} > 15
 install -m 0644 %{SOURCE8} %{buildroot}/lib/systemd/system/munin-node.service
 install -m 0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
 %else
@@ -241,7 +243,7 @@ if [ "$1" = "1" ]; then
 fi
 
 %preun node
-%if 0%{?rhel} > 6 || 0%{?fedora} > 14
+%if 0%{?rhel} > 6 || 0%{?fedora} > 15
 test "$1" != 0 || %{_bindir}/systemctl disable munin-node.service || :
 %else
 test "$1" != 0 || %{_initrddir}/munin-node stop &>/dev/null || :
@@ -296,7 +298,7 @@ exit 0
 %config(noreplace) /etc/munin/plugin-conf.d/postfix
 %config(noreplace) /etc/munin/plugin-conf.d/df
 %config(noreplace) /etc/logrotate.d/munin-node
-%if 0%{?rhel} > 6 || 0%{?fedora} > 14
+%if 0%{?rhel} > 6 || 0%{?fedora} > 15
 /lib/systemd/system/munin-node.service
 %else
 /etc/rc.d/init.d/munin-node
@@ -327,6 +329,11 @@ exit 0
 %dir %{perl_vendorlib}/Munin
 %{perl_vendorlib}/Munin/Common
 
+%if 0%{?rhel} > 6 || 0%{?fedora} > 15
+%dir %{_localstatedir}/run/%{name}/
+%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
+%endif
+
 %if 0%{?rhel} > 4 || 0%{?fedora} > 6
 %files java-plugins
 %defattr(-, root, root)
@@ -334,15 +341,11 @@ exit 0
 %{_datadir}/munin/plugins/jmx_
 %endif
 
-%if 0%{?rhel} > 6 || 0%{?fedora} > 14
-%dir %{_localstatedir}/run/%{name}/
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
-%endif
-
 
 %changelog
 * Wed Jun 15 2011 D. Johnson <fenris02 at fedoraproject.org> - 1.4.5-12
 - Use tmpfiles.d instead of ExecStartPre
+- Add patch for noSuchObject errors (BZ# 712245)
 
 * Fri Jun 10 2011 Marcela Mašláňová <mmaslano at redhat.com> - 1.4.5-11
 - Perl 5.14 mass rebuild
diff --git a/sources b/sources
index 5b5ce6f..a54dbce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c7bc5d0579a45501cb064c8b5b55e5d1  munin.conf
+7578794bf2b3f32e5431ab4b42a32189  munin-1.4.5-no-such-object.patch