[munin] Bugfix release: - BZ# 822992 Including GCTime.java.patch - BZ# 747663 Include older cpuspeed.in for

[fenris02]

commit 82511c632654df8d69b754a2aecc5c6bb13c47c5
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Fri May 18 21:22:26 2012 -0500

    Bugfix release:
    - BZ# 822992 Including GCTime.java.patch
    - BZ# 747663 Include older cpuspeed.in for older kernels
    - BZ# 822894 Requires: perl-Net-CIDR
    - BZ# 746083 Append user=munin for munin-node plugins
    - BZ# 821912 Move htaccess to httpd/conf.d/munin.conf for easier
      administration

 .gitignore |    2 ++
 munin.spec |   36 +++++++++++++++++++++++++++++++++++-
 sources    |    2 +-
 3 files changed, 38 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 87dcb6d..e4b2777 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ munin-1.4.5.tar.gz
 /munin-1.4.5-no-such-object.patch
 /munin-1.4.6.tar.gz
 /munin-1.4.7.tar.gz
+/GCTime.java.patch
+/cpuspeed.in.rev1243
diff --git a/munin.spec b/munin.spec
index 164b758..29827a0 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.4.7
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
 Group:     System Environment/Daemons
@@ -13,6 +13,8 @@ Source10: http://downloads.sourceforge.net/sourceforge/munin/%{name}-%{version}.
 
 Patch1: munin-1.4.6-restorecon.patch
 Patch2: munin-1.4.2-fontfix.patch
+# BZ#822992 http://munin-monitoring.org/attachment/ticket/1215/GCTime.java.patch
+Patch3: GCTime.java.patch
 
 Source1: munin-1.2.4-sendmail-config
 Source2: munin-1.2.5-hddtemp_smartctl-config
@@ -23,6 +25,10 @@ Source7: munin-1.4.5-df-config
 Source8: munin-node.service
 Source9: %{name}.conf
 Source11: munin-node.service-privatetmp
+# BZ#747663 http://munin-monitoring.org/ticket/1155
+%if 0%{?rhel} < 6 && 0%{?fedora} < 11
+Source12: cpuspeed.in.rev1243
+%endif
 
 BuildArchitectures: noarch
 
@@ -86,6 +92,8 @@ Summary: Network-wide graphing framework (node)
 BuildArchitectures: noarch
 Requires: %{name}-common = %{version}
 Requires: perl-Net-Server
+# BZ#822894
+Requires: perl-Net-CIDR
 Requires: procps >= 2.0.7
 Requires: sysstat, /usr/bin/which, hdparm
 Requires(pre): shadow-utils
@@ -143,11 +151,16 @@ java-plugins for munin-node.
 %prep
 %setup -q
 %patch1 -p1
+%if 0%{?rhel} < 6 && 0%{?fedora} < 11
+install -c %{SOURCE12} ./plugins/node.d.linux/cpuspeed.in
+%endif
 
 %if 0%{?rhel} < 6 && 0%{?fedora} < 11
 %patch2 -p0
 %endif
 
+%patch3 -p0
+
 %build
 %if 0%{?rhel} > 4 || 0%{?fedora} > 6
 export  CLASSPATH=plugins/javalib/org/munin/plugin/jmx:$(build-classpath mx4j):$CLASSPATH
@@ -236,6 +249,19 @@ install -m 0644 %{SOURCE6} %{buildroot}/etc/munin/plugin-conf.d/postfix
 install -m 0644 %{SOURCE7} %{buildroot}/etc/munin/plugin-conf.d/df
 # Create for BZ 786030
 touch %{buildroot}/var/lib/munin/plugin-state/yum.state
+# Append for BZ# 746083
+cat - >> %{buildroot}/etc/munin/plugin-conf.d/munin-node <<EOT.node
+[diskstats]
+user munin
+
+[iostat_ios]
+user munin
+EOT.node
+
+# BZ#821912 - Move .htaccess to apache config to allow easier user-access changes.
+mkdir -p %{buildroot}/etc/httpd/conf.d
+sed -e 's/# </</g' %{buildroot}/var/www/html/munin/.htaccess > %{buildroot}/etc/httpd/conf.d/munin.conf
+rm %{buildroot}/var/www/html/munin/.htaccess
 
 # Fix path in java plugin
 sed -i 's,/opt/munin/lib/munin-jmx-plugins.jar,/usr/share/java/munin-jmx-plugins.jar,g' %{buildroot}/usr/share/munin/plugins/jmx_
@@ -315,6 +341,7 @@ exit 0
 %config(noreplace) /etc/cron.d/munin
 %config(noreplace) /etc/munin/munin.conf
 %config(noreplace) /etc/logrotate.d/munin
+%config(noreplace) /etc/httpd/conf.d/munin.conf
 %attr(-, munin, munin) %dir /var/lib/munin
 %attr(-, munin, munin) %dir /var/lib/munin/plugin-state
 %attr(-, munin, munin) %dir /var/log/munin
@@ -379,6 +406,13 @@ exit 0
 
 
 %changelog
+* Fri May 18 2012 D. Johnson <fenris02 at fedoraproject.org> - 1.4.7-5
+- BZ# 822992 Including GCTime.java.patch
+- BZ# 747663 Include older cpuspeed.in for older kernels
+- BZ# 822894 Requires: perl-Net-CIDR
+- BZ# 746083 Append user=munin for munin-node plugins
+- BZ# 821912 Move htaccess to httpd/conf.d/munin.conf for easier administration
+
 * Sun May 13 2012 Kevin Fenzi <kevin at scrye.com> - 1.4.7-4
 - Fix ownership on /var/run/munin. Fixes bug #821204
 
diff --git a/sources b/sources
index d3f0d40..385bc5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb61f2022d215e8a3bbe4a7a4b77bc43  munin-1.4.7.tar.gz
+327ac555637a9cea2e36be4e77d773ba  cpuspeed.in.rev1243