rpms/munin/devel munin-1.2.6-ntp_offset.patch, NONE, 1.1 munin.spec, 1.14, 1.15 sources, 1.3, 1.4 .cvsignore, 1.3, 1.4

[Kevin Fenzi (kevin)]

Author: kevin

Update of /cvs/extras/rpms/munin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1284

Modified Files:
	munin.spec sources .cvsignore 
Added Files:
	munin-1.2.6-ntp_offset.patch 
Log Message:
Upgrade to 1.2.6


munin-1.2.6-ntp_offset.patch:

--- NEW FILE munin-1.2.6-ntp_offset.patch ---
diff -Nur munin-1.2.6.orig/node/node.d/ntp_offset.in munin-1.2.6/node/node.d/ntp_offset.in
--- munin-1.2.6.orig/node/node.d/ntp_offset.in	2008-01-27 11:17:17.000000000 -0700
+++ munin-1.2.6/node/node.d/ntp_offset.in	2008-06-25 12:52:05.000000000 -0600
@@ -1,4 +1,4 @@
-#!@@GOODSH@@ -w
+#!@@GOODSH@@
 # -*- sh -*-
 #
 # Plugin to monitor NTP time offset.


Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/munin.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- munin.spec	20 May 2008 18:08:30 -0000	1.14
+++ munin.spec	25 Jun 2008 21:42:17 -0000	1.15
@@ -1,6 +1,6 @@
 Name:      munin
-Version:   1.2.5
-Release:   5%{?dist}
+Version:   1.2.6
+Release:   1%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
 Group:     System Environment/Daemons
@@ -14,10 +14,10 @@
 Source3: munin-node.logrotate
 Source4: munin.logrotate
 Source5: nf_conntrack
-Patch0: munin-1.2.4-cron.patch
 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
@@ -73,10 +73,10 @@
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 
@@ -138,6 +138,11 @@
 # install config for nf_conntrack
 install -m 0644 %{SOURCE5} %{buildroot}/etc/munin/plugin-conf.d/nf_conntrack
 
+# 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 +158,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 +178,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 +186,8 @@
 %{_datadir}/munin/munin-update
 %{_datadir}/munin/VeraMono.ttf
 %{perl_vendorlib}/Munin.pm
+%dir %{perl_vendorlib}/Munin
+%{perl_vendorlib}/Munin/Plugin.pm
 /var/www/html/munin/cgi/munin-cgi-graph
 %dir /etc/munin/templates
 %dir /etc/munin
@@ -228,6 +236,9 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/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	25 Jun 2008 21:42:17 -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/devel/.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	25 Jun 2008 21:42:17 -0000	1.4
@@ -1 +1 @@
-munin_1.2.5.tar.gz
+munin_1.2.6.tar.gz