[munin: 1/2] Updated to v2.0.2
fenris02
fenris02 at fedoraproject.org
Mon Jul 16 03:08:00 UTC 2012
commit fc4a6cf2d46a838b86cabb648079787f64c3ffa0
Author: D. Johnson <fenris02 at fedoraproject.org>
Date: Sun Jul 15 21:58:44 2012 -0500
Updated to v2.0.2
.gitignore | 1 +
GCTime.java.patch | 11 -
cpuspeed.in.rev1243 | 59 ---
munin-1.2.4-sendmail-config | 3 -
munin-1.2.5-hddtemp_smartctl-config | 2 -
munin-1.2.6-postfix-config | 4 -
munin-1.4.2-fontfix.patch | 16 -
munin-1.4.5-df-config | 2 -
munin-1.4.6-restorecon.patch | 11 -
munin-1.4.7.tar.gz.sha256sum | 1 -
munin-2.0.2.tar.gz.sha256sum | 1 +
munin-node.service | 11 -
munin.spec | 720 ++++++++++-------------------------
sources | 2 +-
14 files changed, 209 insertions(+), 635 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 87dcb6d..b8f469f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ 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
+/munin-2.0.2.tar.gz
diff --git a/munin-2.0.2.tar.gz.sha256sum b/munin-2.0.2.tar.gz.sha256sum
new file mode 100644
index 0000000..ef6a494
--- /dev/null
+++ b/munin-2.0.2.tar.gz.sha256sum
@@ -0,0 +1 @@
+e8a5266a85cde8b89a97fb7463a56a7ac9c038035b952e36047b7d599bb9181b munin-2.0.2.tar.gz
diff --git a/munin.spec b/munin.spec
index 29827a0..0824657 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,81 +1,99 @@
-Name: munin
-Version: 1.4.7
-Release: 5%{?dist}
-Summary: Network-wide graphing framework (grapher/gatherer)
-License: GPLv2 and Bitstream Vera
-Group: System Environment/Daemons
-URL: http://munin.projects.linpro.no/
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: http://downloads.sourceforge.net/sourceforge/munin/%{name}-%{version}.tar.gz
-Source10: http://downloads.sourceforge.net/sourceforge/munin/%{name}-%{version}.tar.gz.sha256sum
-
-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
-Source3: munin-node.logrotate
-Source4: munin.logrotate
-Source6: munin-1.2.6-postfix-config
-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
+Name: munin
+Version: 2.0.2
+Release: 1%{?dist}
+Summary: Network-wide graphing framework (grapher/gatherer)
+
+Group: System Environment/Daemons
+License: GPLv2
+URL: http://munin-monitoring.org/
+Source0: http://downloads.sourceforge.net/sourceforge/munin/%{name}-%{version}.tar.gz
+Source1: http://downloads.sourceforge.net/sourceforge/munin/%{name}-%{version}.tar.gz.sha256sum
+Source3: munin-node.logrotate
+Source4: munin.logrotate
+Source9: %{name}.conf
+Source11: munin-node.service-privatetmp
+
+BuildArch: noarch
+
+BuildRequires: hostname
+BuildRequires: perl >= 5.8
+BuildRequires: perl(Directory::Scratch)
+BuildRequires: perl(Module::Build)
+BuildRequires: perl(Net::Server)
+BuildRequires: perl(Net::SNMP)
+BuildRequires: perl(Test::Exception)
+BuildRequires: perl(Test::MockModule)
+BuildRequires: perl(Test::MockObject)
+#BuildRequires: perl(Test::Perl::Critic) >= 1.096 ## Not packaged
+BuildRequires: perl(Test::Pod::Coverage)
+BuildRequires: perl(Time::HiRes)
+BuildRequires: perl(Net::SSLeay)
+BuildRequires: perl(HTML::Template)
+BuildRequires: perl(Log::Log4perl) >= 1.18
+
+Requires(pre): shadow-utils
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+# Munin server requires
+Requires: logrotate
+Requires: perl >= 5.8
+Requires: perl(CGI::Fast)
+Requires: perl(Digest::MD5)
+Requires: perl(File::Copy::Recursive)
+Requires: perl(Getopt::Long)
+Requires: perl(HTML::Template)
+Requires: perl(IO::Socket::INET6)
+Requires: perl(Log::Log4perl) >= 1.18
+Requires: perl(Net::Server)
+Requires: perl(Net::SNMP)
+Requires: perl(Net::SSLeay)
+Requires: perl(Params::Validate)
+Requires: perl(RRDs)
+Requires: perl(Storable)
+Requires: perl(Text::Balanced)
+Requires: perl(DateTime)
+Requires: perl(Time::HiRes)
+Requires: sysstat
+
+# SystemD
+%if 0%{?rhel} > 6 || 0%{?fedora} > 15
+BuildRequires: systemd-units
%endif
-BuildArchitectures: noarch
-
-BuildRequires: perl-Module-Build
-# needed for hostname for the defaut config
-BuildRequires: net-tools
-BuildRequires: perl-HTML-Template
-BuildRequires: perl-Log-Log4perl
-BuildRequires: perl-Net-Server
-BuildRequires: perl-Net-SSLeay
-BuildRequires: perl-Net-SNMP
-
+# Munin node requires
+Requires: perl(Crypt::DES)
+Requires: perl(Digest::HMAC)
+Requires: perl(Digest::SHA1)
+Requires: perl(Net::CIDR)
+Requires: perl(Net::Server)
+Requires: perl(Net::Server::Fork)
+Requires: perl(Net::SNMP)
+Requires: perl(Net::SSLeay)
+Requires: perl(Time::HiRes)
+
+# Munin node java monitor requires
+#Requires: java-jmx
# java buildrequires on fedora < 17 and rhel
%if 0%{?rhel} > 4 || 0%{?fedora} < 17
-BuildRequires: java-1.6.0-devel
-BuildRequires: mx4j
-BuildRequires: jpackage-utils
+BuildRequires: java-1.6.0-devel
+BuildRequires: mx4j
+BuildRequires: jpackage-utils
%endif
# java buildrequires on fedora 17 and higher
%if 0%{?fedora} > 16
-BuildRequires: java-1.7.0-devel
-BuildRequires: mx4j
-BuildRequires: jpackage-utils
+BuildRequires: java-1.7.0-devel
+BuildRequires: mx4j
+BuildRequires: jpackage-utils
%endif
-%if 0%{?rhel} > 6 || 0%{?fedora} > 15
-BuildRequires: systemd-units
-%endif
+# CGI requires
+Requires: dejavu-sans-mono-fonts
-Requires: %{name}-common = %{version}
-Requires: perl-Net-Server
-Requires: perl-Net-SNMP
-Requires: rrdtool
-Requires: logrotate
-Requires: /bin/mail
-Requires(pre): shadow-utils
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-%if 0%{?rhel} > 5 || 0%{?fedora} > 6
-Requires: dejavu-sans-mono-fonts
-%else
-Requires: bitstream-vera-fonts
-%endif
%description
-Munin is a highly flexible and powerful solution used to create graphs of
-virtually everything imaginable throughout your network, while still
+Munin is a highly flexible and powerful solution used to create graphs
+of virtually everything imaginable throughout your network, while still
maintaining a rattling ease of installation and configuration.
This package contains the grapher/gatherer. You will only need one instance of
@@ -86,25 +104,25 @@ pages, suitable for viewing with your graphical web browser of choice.
Munin is written in Perl, and relies heavily on Tobi Oetiker's excellent
RRDtool.
+
%package node
-Group: System Environment/Daemons
-Summary: Network-wide graphing framework (node)
+Group: System Environment/Daemons
+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
+Requires: %{name}-common = %{version}
+Requires: perl-Net-Server
+Requires: perl-Net-CIDR
+Requires: procps >= 2.0.7
+Requires: sysstat, /usr/bin/which, hdparm
+Requires(pre): shadow-utils
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description node
-Munin is a highly flexible and powerful solution used to create graphs of
-virtually everything imaginable throughout your network, while still
+Munin is a highly flexible and powerful solution used to create graphs
+of virtually everything imaginable throughout your network, while still
maintaining a rattling ease of installation and configuration.
This package contains node software. You should install it on all the nodes
@@ -117,161 +135,108 @@ cpu usage, network usage, load average, and so on. Creating your own plugins
which are capable of extracting other system-specific values is very easy,
and is often done in a matter of minutes. You can also create plugins which
relay information from other devices in your network that can't run Munin,
-such as a switch or a server running another operating system, by using
-SNMP or similar technology.
+such as a switch or a server running another operating system, by using SNMP
+or similar technology.
Munin is written in Perl, and relies heavily on Tobi Oetiker's excellent
RRDtool.
+
%package common
-Group: System Environment/Daemons
-Summary: Network-wide graphing framework (common files)
+Group: System Environment/Daemons
+Summary: Network-wide graphing framework (common files)
BuildArchitectures: noarch
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description common
-Munin is a highly flexible and powerful solution used to create graphs of
-virtually everything imaginable throughout your network, while still
+Munin is a highly flexible and powerful solution used to create graphs
+of virtually everything imaginable throughout your network, while still
maintaining a rattling ease of installation and configuration.
This package contains common files that are used by both the server (munin)
and node (munin-node) packages.
-%if 0%{?rhel} > 4 || 0%{?fedora} > 6
+
%package java-plugins
-Group: System Environment/Daemons
-Summary: java-plugins for munin
-Requires: %{name}-node = %{version}
+Group: System Environment/Daemons
+Summary: java-plugins for munin
+Requires: %{name}-node = %{version}
BuildArchitectures: noarch
+Requires: jpackage-utils
%description java-plugins
java-plugins for munin-node.
-%endif
-
-%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
+%prep
+%setup -q -n munin-%{version}
+sed -i -e '
+ s/^USER := \(.*\)/USER := nobody/;
+ s/^GROUP := \(.*\)/GROUP := nobody/;
+ s/^CHOWN := \(.*\)/CHOWN := true/;
+ ' dists/redhat/Makefile.config
%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
+# Convert to utf-8
+for file in Announce-2.0 COPYING ChangeLog Checklist HACKING.pod README RELEASE UPGRADING UPGRADING-1.4; do
+ iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
+ touch -r $file $file.new && \
+ mv $file.new $file
+done
+
+# Fix the wrong FSF address
+for FILE in plugins/node.d.linux/tcp.in COPYING plugins/node.d.linux/bonding_err_.in; do
+ sed -i 's|59 Temple Place.*Suite 330, Boston, MA *02111-1307|51 Franklin St, Fifth Floor, Boston, MA 02110-1301|g' $FILE
+done
+
+
%install
+rm -rf ${buildroot}
## Node
make CONFIG=dists/redhat/Makefile.config \
-%if 0%{?rhel} > 4 || 0%{?fedora} > 6
- JAVALIBDIR=%{buildroot}%{_datadir}/java \
-%endif
- PREFIX=%{buildroot}%{_prefix} \
+ DESTDIR=%{buildroot} \
DOCDIR=%{buildroot}%{_docdir}/%{name}-%{version} \
+ JAVALIBDIR=%{buildroot}%{_datadir}/java \
MANDIR=%{buildroot}%{_mandir} \
- DESTDIR=%{buildroot} \
+ PREFIX=%{buildroot}%{_prefix} \
install
-mkdir -p %{buildroot}/etc/munin/plugins
-mkdir -p %{buildroot}/etc/munin/node.d
-mkdir -p %{buildroot}/etc/munin/plugin-conf.d
-mkdir -p %{buildroot}/etc/munin/conf.d
-mkdir -p %{buildroot}/etc/logrotate.d
-mkdir -p %{buildroot}/var/lib/munin
-mkdir -p %{buildroot}/var/log/munin
-
-# Fix default config file
-sed -i 's,/etc/munin/munin-conf.d,/etc/munin/conf.d,' %{buildroot}/etc/munin/munin.conf
+# Remove fonts
+rm %{buildroot}/usr/share/munin/DejaVuSans*.ttf
-#
-# don't enable munin-node by default.
-#
-%if 0%{?rhel} > 6 || 0%{?fedora} > 15
-mkdir -p %{buildroot}/lib/systemd/system/
-%endif
-# Fedora 17 and higer uses privatetmp
-%if 0%{?fedora} > 16
-install -m 0644 %{SOURCE11} %{buildroot}/lib/systemd/system/munin-node.service
-%endif
-
-%if 0%{?fedora} > 15 && 0%{?fedora} < 17
-# Fedora 16 does not use privatetmp
-install -m 0644 %{SOURCE8} %{buildroot}/lib/systemd/system/munin-node.service
-%endif
-%if 0%{?rhel} > 4 || 0%{?fedora} < 16
-# Fedora 15 and rhel use sysvinit
-mkdir -p %{buildroot}/etc/rc.d/init.d
-cat dists/redhat/munin-node.rc | sed -e 's/2345/\-/' > %{buildroot}/etc/rc.d/init.d/munin-node
-chmod 755 %{buildroot}/etc/rc.d/init.d/munin-node
-%endif
+# install logrotate scripts
+mkdir -p %{buildroot}/etc/logrotate.d
+install -m 0644 %{SOURCE3} %{buildroot}/etc/logrotate.d/munin-node
+install -m 0644 %{SOURCE4} %{buildroot}/etc/logrotate.d/munin
-%if 0%{?rhel} > 6 || 0%{?fedora} > 14
+# install tmpfiles.d entry
mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
install -m 0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
-%endif
-
-install -m0644 dists/tarball/plugins.conf %{buildroot}/etc/munin/plugin-conf.d/munin-node
-
-#
-# remove the Sybase plugin for now, as they need perl modules
-# that are not in extras. We can readd them when/if those modules are added.
-#
-rm -f %{buildroot}/usr/share/munin/plugins/sybase_space
-
-## Server
-mkdir -p %{buildroot}/var/www/html/munin
-mkdir -p %{buildroot}/var/log/munin
-mkdir -p %{buildroot}/etc/cron.d
-mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
+# BZ#821912 - Move .htaccess to apache config to allow easier user-access changes.
+mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
+sed -e 's/# </</g' %{buildroot}/var/www/html/munin/.htaccess > %{buildroot}%{_sysconfdir}/httpd/conf.d/munin.conf
+rm %{buildroot}/var/www/html/munin/.htaccess
+# install cron script
+mkdir -p %{buildroot}/etc/cron.d/munin
install -m 0644 dists/redhat/munin.cron.d %{buildroot}/etc/cron.d/munin
-cp -a master/www/* %{buildroot}/var/www/html/munin/
-# install config for sendmail under fedora
-install -m 0644 %{SOURCE1} %{buildroot}/etc/munin/plugin-conf.d/sendmail
-# install config for hddtemp_smartctl
-install -m 0644 %{SOURCE2} %{buildroot}/etc/munin/plugin-conf.d/hddtemp_smartctl
-# install logrotate scripts
-install -m 0644 %{SOURCE3} %{buildroot}/etc/logrotate.d/munin-node
-install -m 0644 %{SOURCE4} %{buildroot}/etc/logrotate.d/munin
-# install config for postfix under fedora
-install -m 0644 %{SOURCE6} %{buildroot}/etc/munin/plugin-conf.d/postfix
-# install df config to exclude fses we shouldn't try and monitor
-install -m 0644 %{SOURCE7} %{buildroot}/etc/munin/plugin-conf.d/df
-# Create for BZ 786030
+# ensure file exists
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_
+# Fedora 17 and higer uses privatetmp
+mkdir -p %{buildroot}/lib/systemd/system
+install -m 0644 %{SOURCE11} %{buildroot}/lib/systemd/system/munin-node.service
-# Use system font
-rm -f $RPM_BUILD_ROOT/%{_datadir}/munin/DejaVuSansMono.ttf
-rm -f $RPM_BUILD_ROOT/%{_datadir}/munin/DejaVuSans.ttf
+mkdir -p %{buildroot}/etc/munin/node.d
-%clean
-rm -rf $RPM_BUILD_ROOT
+# Remove plugins that are missing deps
+rm %{buildroot}/usr/share/munin/plugins/sybase_space
#
# node package scripts
@@ -303,7 +268,7 @@ test "$1" != 0 || /sbin/chkconfig --del munin-node
%postun node
if [ "$1" = "0" ]; then
- find /etc/munin/plugins/ -maxdepth 1 -type l -print0 |xargs -0 rm || :
+ find %{_sysconfdir}/munin/plugins/ -maxdepth 1 -type l -print0 |xargs -0 rm || :
fi
%triggerun node -- munin-node < 1.4.7-2
@@ -322,361 +287,88 @@ useradd -r -g munin -d /var/lib/munin -s /sbin/nologin \
-c "Munin user" munin
exit 0
+
%files
%defattr(-, root, root)
-%doc %{_docdir}/%{name}-%{version}/
-%{_bindir}/munin-cron
-%{_bindir}/munindoc
-%{_bindir}/munin-check
-%dir %{_datadir}/munin
-%{_datadir}/munin/munin-graph
-%{_datadir}/munin/munin-html
-%{_datadir}/munin/munin-limits
-%{_datadir}/munin/munin-update
-%{perl_vendorlib}/Munin/Master
-%dir /etc/munin/templates
-%dir /etc/munin
-%dir /etc/munin/conf.d
-%config(noreplace) /etc/munin/templates/*
-%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
-%attr(-, munin, munin) /var/www/html/munin
+%doc %{_mandir}/man1/munin*
+%doc %{_mandir}/man3/Munin::*
+%doc %{_mandir}/man5/munin*
%doc %{_mandir}/man8/munin*
-%doc %{_mandir}/man5/munin.conf*
+%dir %{_sysconfdir}/munin
+%dir %{_sysconfdir}/munin/static
+%dir %{_sysconfdir}/munin/templates
+%dir %{_sysconfdir}/munin/templates/partial
+%dir %{_datadir}/munin
+%dir %{_datadir}/munin/plugins
+%dir /var/www/html/munin
+%dir /var/www/html/munin/cgi
+%config(noreplace) %{_sysconfdir}/cron.d/munin
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/munin.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/munin
+%config(noreplace) %{_sysconfdir}/munin/munin.conf
+%config(noreplace) %{_sysconfdir}/munin/static/*
+%config(noreplace) %{_sysconfdir}/munin/templates/partial/*.tmpl
+%config(noreplace) %{_sysconfdir}/munin/templates/*.tmpl
+%attr(0755,root,root) %{_bindir}/munin-check
+%attr(0755,root,root) %{_bindir}/munin-cron
+%attr(0755,root,root) %{_bindir}/munindoc
+%attr(0755,root,root) %{_sbindir}/munin-node
+%attr(0755,root,root) %{_sbindir}/munin-node-configure
+%attr(0755,root,root) %{_sbindir}/munin-run
+%attr(0755,root,root) %{_sbindir}/munin-sched
+%{_datadir}/munin/munin*
+%{perl_vendorlib}/Munin/Master/*.pm
+/var/www/html/munin/cgi/munin-cgi-graph
+/var/www/html/munin/cgi/munin-cgi-html
+
%files node
%defattr(-, root, root)
-%config(noreplace) /etc/munin/munin-node.conf
-%dir /etc/munin/plugin-conf.d
-%dir /etc/munin/node.d
-%config(noreplace) /etc/munin/plugin-conf.d/munin-node
-%config(noreplace) /etc/munin/plugin-conf.d/sendmail
-%config(noreplace) /etc/munin/plugin-conf.d/hddtemp_smartctl
-%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} > 15
+# %%doc %{_docdir}/%{name}-%{version}/
+%doc %{_mandir}/man5/munin-node*
+%doc %{_mandir}/man3/Munin*
+%doc %{_mandir}/man1/munin*
+# %%dir %{_sysconfdir}/munin/plugin-conf.d
+%dir %{_sysconfdir}/munin/node.d
+%dir %{_sysconfdir}/munin/plugins
+%dir %{_sysconfdir}/munin
+%dir %{_datadir}/munin
+%dir %attr(-, munin, munin) /var/lib/munin
+%dir %attr(-, munin, munin) /var/lib/munin/plugin-state
+%dir %attr(-, munin, munin) /var/log/munin
+%config(noreplace) %{_sysconfdir}/logrotate.d/munin-node
+%config(noreplace) %{_sysconfdir}/munin/munin-node.conf
+# %%config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/*
/lib/systemd/system/munin-node.service
-%else
-/etc/rc.d/init.d/munin-node
-%endif
%{_sbindir}/munin-run
%{_sbindir}/munin-node
%{_sbindir}/munin-node-configure
-%attr(-, munin, munin) %dir /var/log/munin
-%dir %{_datadir}/munin
-%dir /etc/munin/plugins
-%dir /etc/munin
-%attr(-, munin, munin) %dir /var/lib/munin
-%dir %attr(-, munin, munin) /var/lib/munin/plugin-state
%attr(-, munin, munin) /var/lib/munin/plugin-state/yum.state
-%if 0%{?rhel} > 4 || 0%{?fedora} > 6
%exclude %{_datadir}/munin/plugins/jmx_
-%endif
%{_datadir}/munin/plugins/
-%doc %{_docdir}/%{name}-%{version}/
-%doc %{_mandir}/man5/munin-node*
-%doc %{_mandir}/man3/Munin*
-%doc %{_mandir}/man1/munin*
%{perl_vendorlib}/Munin/Node
%{perl_vendorlib}/Munin/Plugin*
+
%files common
%defattr(-, root, root)
-%doc Announce-1.4.0 ChangeLog COPYING HACKING.pod perltidyrc README RELEASE UPGRADING
+%doc Announce-2.0 COPYING ChangeLog Checklist HACKING.pod README RELEASE UPGRADING UPGRADING-1.4
%dir %{perl_vendorlib}/Munin
+%dir %attr(-, munin, munin) %{_localstatedir}/run/%{name}/
+%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
%{perl_vendorlib}/Munin/Common
-%attr(-, munin, munin) %dir %{_localstatedir}/run/%{name}/
-%if 0%{?rhel} > 6 || 0%{?fedora} > 14
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
-%endif
-%if 0%{?rhel} > 4 || 0%{?fedora} > 6
%files java-plugins
%defattr(-, root, root)
-%{_datadir}/java/%{name}-jmx-plugins.jar
+%{_datadir}/java/munin-jmx-plugins.jar
%{_datadir}/munin/plugins/jmx_
-%endif
%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
-
-* Tue Apr 24 2012 Kevin Fenzi <kevin at scrye.com> - 1.4.7-3
-- A better for for 811867 with triggers.
-- Fix directory conflict. Fixes bug #816340
-- Fix path in java plugin. Fixes bug #816570
-
-* Sun Apr 15 2012 Kevin Fenzi <kevin at scrye.com> - 1.4.7-2
-- Fix node postun from messing up plugins on upgrade. Works around bug #811867
-
-* Wed Mar 14 2012 D. Johnson <fenris02 at fedoraproject.org> - 1.4.7-1
-- updated for 1.4.7 release
-
-* Wed Feb 22 2012 Kevin Fenzi <kevin at scrye.com> 1.4.6-8
-- Build against java-1.7.0 now. Fixes bug #796345
-
-* Tue Jan 31 2012 D. Johnson <fenris02 at fedoraproject.org> - 1.4.6-7
-- Create state file for yum-plugin. Fixes BZ #786030.
-
-* Fri Jan 20 2012 Kevin Fenzi <kevin at scrye.com> - 1.4.6-6
-- Add PrivateTmp=true to systemd unit file. Fixes bug #782512
-- Change logrotate to use munin user. Fixes bug #771017
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.6-5.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Oct 17 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.4.6-4.3
-- Rebuild for java 1.6.0 downgrade (fesco ticket 663)
-
-* Sat Aug 27 2011 Kevin Fenzi <kevin at scrye.com> - 1.4.6-4.1
-- Add patch to run restorecon in the sysvinit script.
-- This doesn't matter on f16+
-
-* Sat Aug 20 2011 D. Johnson <fenris02 at fedoraproject.org> - 1.4.6-4
-- fix tmpfiles.d file for f15 (BZ# 731181)
-
-* Thu Jul 21 2011 Petr Sabata <contyk at redhat.com> - 1.4.6-3
-- Perl mass rebuild
-
-* Wed Jul 20 2011 Petr Sabata <contyk at redhat.com> - 1.4.6-2
-- Perl mass rebuild
-
-* Wed Jul 8 2011 D. Johnson <fenris02 at fedoraproject.org> - 1.4.6-1
-- update to 1.4.6
-
-* Fri Jun 17 2011 Marcela Mašláňová <mmaslano at redhat.com> - 1.4.5-13
-- Perl mass rebuild
-
-* 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
-
-* Wed Jun 1 2011 D. Johnson <fenris02 at fedoraproject.org> - 1.4.5-10
-- Fixes http://munin-monitoring.org/ticket/887
-
-* Mon May 30 2011 D. Johnson <fenris02 at fedoraproject.org> - 1.4.5-9
-- Native systemd service file for munin-node (BZ# 699275)
-
-* Tue Feb 08 2011 Kevin Fenzi <kevin at tummy.com> - 1.4.5-8
-- Fix issue with uppercase node names returning no data. Fixes #673263
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.5-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Sun Dec 05 2010 Kevin Fenzi <kevin at tummy.com> - 1.4.5-6
-- Adjust the df fix to include all the right fses
-
-* Thu Nov 25 2010 Kevin Fenzi <kevin at tummy.com> - 1.4.5-5
-- Exclude some fses from df plugin. fixes #601410
-
-* Wed Aug 11 2010 Todd Zullinger <tmz at pobox.com> - 1.4.5-4.1
-- Move jmx_ plugin to java-plugins package
-
-* Wed Jul 07 2010 Kevin Fenzi <kevin at tummy.com> - 1.4.5-4
-- Move docs to common subpackage to make sure COPYING is installed.
-
-* Sat Jul 03 2010 Kevin Fenzi <kevin at tummy.com> - 1.4.5-3
-- Add /etc/munin/node.d dir
-
-* Sat Jun 12 2010 Kevin Fenzi <kevin at tummy.com> - 1.4.5-2
-- Add /etc/munin/conf.d/ dir
-
-* Sat Jun 05 2010 Kevin Fenzi <kevin at tummy.com> - 1.4.5-1
-- Update to 1.4.5
-
-* Tue Jun 01 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.4.4-2
-- Mass rebuild with perl-5.12.0
-
-* Mon Mar 01 2010 Kevin Fenzi <kevin at tummy.com> - 1.4.4-1
-- Update to 1.4.4
-- Add more doc files. Fixes bug #563824
-- fw_forwarded_local fixed upstream in 1.4.4. Fixes bug #568500
-
-* Sun Jan 17 2010 Kevin Fenzi <kevin at tummy.com> - 1.4.3-2
-- Fix owner on state files.
-- Add some BuildRequires.
-- Make munin-node-configure only run on install, not upgrade. bug 540687
-
-* Thu Dec 31 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.3-1
-- Update to 1.4.3
-
-* 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
-
-* Wed Dec 09 2009 Ingvar Hagelund <ingvar at linpro.no> - 1.4.1-2
-- Remove jmx plugins when not supported (like on el4 and older fedora)
-- Correct font path on older distros like el5, el4 and fedora<11
-
-* Fri Dec 04 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.1-1
-- Update to 1.4.1
-
-* Sat Nov 28 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.0-1
-- Update to final 1.4.0 version
-
-* Sat Nov 21 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.0-0.1.beta
-- Update to beta 1.4.0 version.
-- Add common subpackage for common files.
-
-* Sun Nov 08 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.0-0.1.alpha
-- Initial alpha version of 1.4.0
-
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.6-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.6-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Jan 24 2009 Andreas Thienemann <andreas at bawue.net> - 1.2.6-8
-- Updated dependencies to better reflect plugin requirements
-- Added hddtemp_smartctl patch to only scan for standby state on /dev/[sh]d? devices.
-
-* Sat Jan 17 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.6-7
-- Adjust font requires for new dejavu-sans-mono-fonts name (fixes #480463)
-
-* Mon Jan 12 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.6-6
-- Fix to require the correct font
-
-* Sun Jan 11 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.6-5
-- Switch to using dejavu-fonts instead of bitstream-vera
-
-* Sun Jan 04 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.6-4
-- Require bitstream-vera-fonts-sans-mono for Font (fixes #477428)
-
-* Mon Aug 11 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.6-3
-- Move Munin/Plugin.pm to the node subpackage (fixes #457403)
-
-* Sat Jul 12 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.6-2
-- Apply postfix patch (fixes #454159)
-- Add perl version dep and remove unneeded perl-HTML-Template (fixes #453923)
-
-* Fri Jun 20 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.6-1
-- Upgrade to 1.2.6
-
-* Tue May 20 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.5-5
-- Rebuild for new perl
-
-* Wed Dec 26 2007 Kevin Fenzi <kevin at tummy.com> - 1.2.5-4
-- Add patch to fix ampersand and degrees in plugins (fixes #376441)
-
-* Fri Nov 30 2007 Kevin Fenzi <kevin at tummy.com> - 1.2.5-3
-- Removed unnneeded plugins.conf file (fixes #288541)
-- Fix license tag.
-- Fix ip_conntrack monitoring (fixes #253192)
-- Switch to new useradd guidelines.
-
-* Tue Mar 27 2007 Kevin Fenzi <kevin at tummy.com> - 1.2.5-2
-- Fix directory ownership (fixes #233886)
-
-* Tue Oct 17 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.5-1
-- Update to 1.2.5
-- Fix HD stats (fixes #205042)
-- Add in logrotate scripts that seem to have been dropped upstream
-
-* Sun Aug 27 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-10
-- Rebuild for fc6
-
-* Tue Jun 27 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-9
-- Re-enable snmp plugins now that perl-Net-SNMP is available (fixes 196588)
-- Thanks to Herbert Straub <herbert at linuxhacker.at> for patch.
-- Fix sendmail plugins to look in the right place for the queue
-
-* 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)
-
-* Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-6
-- Readded old changelog entries per request
-- Rebuilt for fc5
-
-* Sat Dec 24 2005 Kevin Fenzi <kevin at tummy.com> - 1.2.4-5
-- Fixed ownership for /var/log/munin in node subpackage (fixes 176529)
-
-* Wed Dec 14 2005 Kevin Fenzi <kevin at tummy.com> - 1.2.4-4
-- Fixed ownership for /var/lib/munin in node subpackage
-
-* Wed Dec 14 2005 Kevin Fenzi <kevin at tummy.com> - 1.2.4-3
-- Fixed libdir messup to allow builds on x86_64
-
-* Mon Dec 12 2005 Kevin Fenzi <kevin at tummy.com> - 1.2.4-2
-- Removed plugins that require Net-SNMP and Sybase
-
-* Tue Dec 6 2005 Kevin Fenzi <kevin at tummy.com> - 1.2.4-1
-- Inital cleanup for fedora-extras
-
-* Thu Apr 21 2005 Ingvar Hagelund <ingvar at linpro.no> - 1.2.3-4
-- Fixed a bug in the iostat plugin
-
-* Wed Apr 20 2005 Ingvar Hagelund <ingvar at linpro.no> - 1.2.3-3
-- Added the missing /var/run/munin
-
-* Tue Apr 19 2005 Ingvar Hagelund <ingvar at linpro.no> - 1.2.3-2
-- Removed a lot of unecessary perl dependencies
-
-* Mon Apr 18 2005 Ingvar Hagelund <ingvar at linpro.no> - 1.2.3-1
-- Sync with svn
-
-* Tue Mar 22 2005 Ingvar Hagelund <ingvar at linpro.no> - 1.2.2-5
-- Sync with release of 1.2.2
-- Add some nice text from the suse specfile
-- Minimal changes in the header
-- Some cosmetic changes
-- Added logrotate scripts (stolen from debian package)
-
-* Sun Feb 01 2004 Ingvar Hagelund <ingvar at linpro.no>
-- Sync with CVS. Version 1.0.0pre2
-
-* Sun Jan 18 2004 Ingvar Hagelund <ingvar at linpro.no>
-- Sync with CVS. Change names to munin.
-
-* Fri Oct 31 2003 Ingvar Hagelund <ingvar at linpro.no>
-- Lot of small fixes. Now builds on more RPM distros
-
-* Wed May 21 2003 Ingvar Hagelund <ingvar at linpro.no>
-- Sync with CVS
-- 0.9.5-1
-
-* Tue Apr 1 2003 Ingvar Hagelund <ingvar at linpro.no>
-- Sync with CVS
-- Makefile-based install of core files
-- Build doc (only pod2man)
-
-* Thu Jan 9 2003 Ingvar Hagelund <ingvar at linpro.no>
-- Sync with CVS, auto rpmbuild
-
-* Thu Jan 2 2003 Ingvar Hagelund <ingvar at linpro.no>
-- Fix spec file for RedHat 8.0 and new version of lrrd
+* Thu Jul 14 2012 D. Johnson <fenris02 at fedoraproject.org> - 2.0.2-1
+- updated to 2.0.2
-* Wed Sep 4 2002 Ingvar Hagelund <ingvar at linpro.no>
-- Small bugfixes in the rpm package
+* Thu Jun 07 2012 D. Johnson <fenris02 at fedoraproject.org> - 2.0.0-1
+- initial 2.0 release
-* Tue Jun 18 2002 Kjetil Torgrim Homme <kjetilho at linpro.no>
-- new package
diff --git a/sources b/sources
index d3f0d40..4a13801 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb61f2022d215e8a3bbe4a7a4b77bc43 munin-1.4.7.tar.gz
+5020eaf323f08ec09600a0b07622861a munin-2.0.2.tar.gz
More information about the scm-commits
mailing list