rpms/munin/devel munin-1.2.5-hddtemp_smartctl-config, NONE, 1.1 munin-node.logrotate, NONE, 1.1 munin.logrotate, NONE, 1.1 munin.spec, 1.9, 1.10 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3

[Kevin Fenzi (kevin)]

Author: kevin

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

Modified Files:
	munin.spec sources .cvsignore 
Added Files:
	munin-1.2.5-hddtemp_smartctl-config munin-node.logrotate 
	munin.logrotate 
Log Message:
Update to 1.2.5
Fix HD stats (fixes #205042)
Add in logrotate scripts that seem to have been dropped upstream



--- NEW FILE munin-1.2.5-hddtemp_smartctl-config ---
[hddtemp_smartctl]
user root


--- NEW FILE munin-node.logrotate ---
/var/log/munin/munin-node.log {
	daily
	missingok
	rotate 7
	compress
	copytruncate
	notifempty
	create 640 root adm
}


--- NEW FILE munin.logrotate ---
/var/log/munin/munin-update.log {
        daily
        missingok
        rotate 7
        compress
        notifempty
        create 640 munin adm
}

/var/log/munin/munin-graph.log {
        daily
        missingok
        rotate 7
        compress
        notifempty
        create 640 munin adm
}

/var/log/munin/munin-html.log {
        daily
        missingok
        rotate 7
        compress
        notifempty
        create 640 munin adm
}

/var/log/munin/munin-limits.log {
        daily
        missingok
        rotate 7
        compress
        notifempty
        create 640 munin adm
}


Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/munin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- munin.spec	28 Aug 2006 04:28:35 -0000	1.9
+++ munin.spec	18 Oct 2006 21:48:04 -0000	1.10
@@ -1,6 +1,6 @@
 Name:      munin
-Version:   1.2.4
-Release:   10%{?dist}
+Version:   1.2.5
+Release:   1%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -10,6 +10,9 @@
 
 Source0: http://download.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
 Source1: munin-1.2.4-sendmail-config
+Source2: munin-1.2.5-hddtemp_smartctl-config
+Source3: munin-node.logrotate
+Source4: munin.logrotate
 Patch0: munin-1.2.4-cron.patch
 Patch1: munin-1.2.4-conf.patch
 BuildArchitectures: noarch
@@ -17,8 +20,8 @@
 Requires: perl-Net-Server perl-Net-SNMP
 Requires: rrdtool
 Requires: logrotate
-Requires(pre):		fedora-usermgmt >= 0.7
-Requires(postun):	fedora-usermgmt >= 0.7
+Requires(pre): fedora-usermgmt >= 0.7
+Requires(postun): fedora-usermgmt >= 0.7
 
 %description
 Munin is a highly flexible and powerful solution used to create graphs of
@@ -104,8 +107,6 @@
 
 install -m0644 dists/tarball/plugins.conf %{buildroot}/etc/munin/
 install -m0644 dists/tarball/plugins.conf %{buildroot}/etc/munin/plugin-conf.d/munin-node
-install -m0644 dists/debian/munin.logrotate %{buildroot}/etc/logrotate.d/munin
-install -m0644 dists/debian/munin-node.logrotate %{buildroot}/etc/logrotate.d/munin-node
 
 # 
 # remove the Sybase plugin for now, as they need perl modules 
@@ -127,6 +128,11 @@
 install -m 0644 ChangeLog %{buildroot}%{_docdir}/%{name}-%{version}/ChangeLog
 # 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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -177,6 +183,7 @@
 %{_datadir}/munin/munin-html
 %{_datadir}/munin/munin-limits
 %{_datadir}/munin/munin-update
+%{_datadir}/munin/VeraMono.ttf
 %{perl_vendorlib}/Munin.pm
 /var/www/html/munin/cgi/munin-cgi-graph
 %dir /etc/munin/templates
@@ -204,6 +211,7 @@
 %config(noreplace) /etc/munin/munin-node.conf
 %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/logrotate.d/munin-node
 /etc/rc.d/init.d/munin-node
 %config(noreplace) /etc/munin/plugins.conf
@@ -226,6 +234,11 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Dec 2005 03:38:04 -0000	1.2
+++ sources	18 Oct 2006 21:48:04 -0000	1.3
@@ -1 +1 @@
-f91f5d96c01d8527db1d2f4b3f0f4cc5  munin_1.2.4.tar.gz
+e863d11693c02bde1c593a6c701e64fd  munin_1.2.5.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Dec 2005 03:38:04 -0000	1.2
+++ .cvsignore	18 Oct 2006 21:48:04 -0000	1.3
@@ -1 +1 @@
-munin_1.2.4.tar.gz
+munin_1.2.5.tar.gz