rpms/munin/F-9 sources, 1.3, 1.4 .cvsignore, 1.3, 1.4 munin.spec, 1.14, 1.15
Kevin Fenzi
kevin at fedoraproject.org
Mon Sep 8 21:11:41 UTC 2008
Author: kevin
Update of /cvs/extras/rpms/munin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32535
Modified Files:
sources .cvsignore munin.spec
Log Message:
Move Munin/Plugin.pm to the node subpackage (fixes #457403)
Apply postfix patch (fixes #454159)
Add perl version dep and remove unneeded perl-HTML-Template (fixes #453923)
Upgrade to 1.2.6
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/munin/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 18 Oct 2006 21:48:04 -0000 1.3
+++ sources 8 Sep 2008 21:11:11 -0000 1.4
@@ -1 +1 @@
-e863d11693c02bde1c593a6c701e64fd munin_1.2.5.tar.gz
+45f84d58f80642ce914f147232f0d396 munin_1.2.6.tar.gz
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/munin/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 18 Oct 2006 21:48:04 -0000 1.3
+++ .cvsignore 8 Sep 2008 21:11:11 -0000 1.4
@@ -1 +1 @@
-munin_1.2.5.tar.gz
+munin_1.2.6.tar.gz
Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/F-9/munin.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- munin.spec 20 May 2008 18:17:44 -0000 1.14
+++ munin.spec 8 Sep 2008 21:11:11 -0000 1.15
@@ -1,6 +1,6 @@
Name: munin
-Version: 1.2.5
-Release: 5%{?dist}
+Version: 1.2.6
+Release: 3%{?dist}
Summary: Network-wide graphing framework (grapher/gatherer)
License: GPLv2 and Bitstream Vera
Group: System Environment/Daemons
@@ -14,16 +14,17 @@
Source3: munin-node.logrotate
Source4: munin.logrotate
Source5: nf_conntrack
-Patch0: munin-1.2.4-cron.patch
+Source6: munin-1.2.6-postfix-config
Patch1: munin-1.2.4-conf.patch
Patch2: munin-1.2.5-nf-conntrack.patch
Patch3: munin-1.2.5-amp-degree.patch
+Patch4: munin-1.2.6-ntp_offset.patch
BuildArchitectures: noarch
-Requires: perl-HTML-Template
Requires: perl-Net-Server perl-Net-SNMP
Requires: rrdtool
Requires: logrotate
Requires(pre): shadow-utils
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description
Munin is a highly flexible and powerful solution used to create graphs of
@@ -49,6 +50,7 @@
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
@@ -73,10 +75,10 @@
%prep
%setup -q
-%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
@@ -137,6 +139,13 @@
install -m 0644 %{SOURCE4} %{buildroot}/etc/logrotate.d/munin
# install config for nf_conntrack
install -m 0644 %{SOURCE5} %{buildroot}/etc/munin/plugin-conf.d/nf_conntrack
+# install config for postfix under fedora
+install -m 0644 %{SOURCE6} %{buildroot}/etc/munin/plugin-conf.d/postfix
+
+# fix MUNIN_LIBDIR issue.
+sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/ps_
+sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/multips
+sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/df_abs
%clean
rm -rf $RPM_BUILD_ROOT
@@ -153,7 +162,7 @@
%post node
/sbin/chkconfig --add munin-node
-/usr/sbin/munin-node-configure --shell | sh
+/usr/sbin/munin-node-configure --shell 2> /dev/null | sh >& /dev/null || :
%preun node
test "$1" != 0 || %{_initrddir}/munin-node stop &>/dev/null || :
@@ -173,6 +182,7 @@
%defattr(-, root, root)
%doc %{_docdir}/%{name}-%{version}/
%{_bindir}/munin-cron
+%{_bindir}/munindoc
%dir %{_datadir}/munin
%{_datadir}/munin/munin-graph
%{_datadir}/munin/munin-html
@@ -180,6 +190,7 @@
%{_datadir}/munin/munin-update
%{_datadir}/munin/VeraMono.ttf
%{perl_vendorlib}/Munin.pm
+%dir %{perl_vendorlib}/Munin
/var/www/html/munin/cgi/munin-cgi-graph
%dir /etc/munin/templates
%dir /etc/munin
@@ -209,7 +220,9 @@
%config(noreplace) /etc/munin/plugin-conf.d/sendmail
%config(noreplace) /etc/munin/plugin-conf.d/hddtemp_smartctl
%config(noreplace) /etc/munin/plugin-conf.d/nf_conntrack
+%config(noreplace) /etc/munin/plugin-conf.d/postfix
%config(noreplace) /etc/logrotate.d/munin-node
+%{perl_vendorlib}/Munin/Plugin.pm
/etc/rc.d/init.d/munin-node
%{_sbindir}/munin-run
%{_sbindir}/munin-node
@@ -228,6 +241,16 @@
%doc %{_mandir}/man5/munin-node*
%changelog
+* 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
More information about the fedora-extras-commits
mailing list