rpms/munin/F-8 munin-1.2.5-amp-degree.patch, NONE, 1.1 munin.spec, 1.12, 1.13
Kevin Fenzi (kevin)
fedora-extras-commits at redhat.com
Fri Dec 28 18:39:31 UTC 2007
- Previous message: rpms/php-magickwand/devel .cvsignore, 1.2, 1.3 php-magickwand.spec, 1.3, 1.4 sources, 1.2, 1.3
- Next message: rpms/grads/EL-5 grads-build_system.patch, NONE, 1.1 grads-dap_build_fixes.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 grads.spec, 1.19, 1.20 libdap.m4, 1.1, 1.2 libnc-dap.m4, 1.2, 1.3 sources, 1.2, 1.3 grads-build_fixes.diff, 1.2, NONE grads-conditionnal_lats.diff, 1.1, NONE grads_dap-no_lats.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kevin
Update of /cvs/extras/rpms/munin/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7180
Modified Files:
munin.spec
Added Files:
munin-1.2.5-amp-degree.patch
Log Message:
Add patch to fix ampersand and degrees in plugins (fixes #376441)
munin-1.2.5-amp-degree.patch:
--- NEW FILE munin-1.2.5-amp-degree.patch ---
diff -Nur munin-1.2.5.orig/node/node.d/acpi.in munin-1.2.5/node/node.d/acpi.in
--- munin-1.2.5.orig/node/node.d/acpi.in 2006-10-17 06:27:35.000000000 -0600
+++ munin-1.2.5/node/node.d/acpi.in 2007-12-26 12:26:26.000000000 -0700
@@ -51,7 +51,7 @@
echo 'graph_title CPU temperature'
echo 'graph_args --base 1000 -l 0'
- echo 'graph_vlabel temp in °C'
+ echo 'graph_vlabel temp in C'
echo 'graph_category sensors'
echo 'graph_info This graph shows temperatures based on output from ACPI.'
echo cpu.label cpu
diff -Nur munin-1.2.5.orig/node/node.d/hddtemp.in munin-1.2.5/node/node.d/hddtemp.in
--- munin-1.2.5.orig/node/node.d/hddtemp.in 2006-10-17 06:27:35.000000000 -0600
+++ munin-1.2.5/node/node.d/hddtemp.in 2007-12-26 12:26:18.000000000 -0700
@@ -53,7 +53,7 @@
echo 'graph_title HDD temperature'
echo 'graph_args --base 1000 -l 0'
- echo 'graph_vlabel temp in °C'
+ echo 'graph_vlabel temp in C'
echo 'graph_category sensors'
for a in $drives ; do echo $a.label $a ; done
exit 0
diff -Nur munin-1.2.5.orig/node/node.d/hddtemp_smartctl.in munin-1.2.5/node/node.d/hddtemp_smartctl.in
--- munin-1.2.5.orig/node/node.d/hddtemp_smartctl.in 2006-10-17 06:27:35.000000000 -0600
+++ munin-1.2.5/node/node.d/hddtemp_smartctl.in 2007-12-26 12:26:22.000000000 -0700
@@ -135,7 +135,7 @@
} elsif ($ARGV[0] eq 'config') {
print "graph_title HDD temperature\n";
print "graph_args --base 1000 -l 0\n";
- print "graph_vlabel temp in °C\n";
+ print "graph_vlabel temp in C\n";
print "graph_category sensors\n";
print "graph_info This graph shows the temperature in degrees Celsius of the hard drives in the machine.\n";
print "$_.label $_\n" foreach @drives;
diff -Nur munin-1.2.5.orig/node/node.d.linux/interrupts.in munin-1.2.5/node/node.d.linux/interrupts.in
--- munin-1.2.5.orig/node/node.d.linux/interrupts.in 2006-10-17 06:27:35.000000000 -0600
+++ munin-1.2.5/node/node.d.linux/interrupts.in 2007-12-26 12:25:32.000000000 -0700
@@ -56,12 +56,12 @@
if [ "$1" = "config" ]; then
# The title of the graph
- echo 'graph_title Interrupts & context switches'
+ echo 'graph_title Interrupts & context switches'
# Arguments to "rrdtool graph". In this case, tell it that the
# lower limit of the graph is '0', and that 1k=1000 (not 1024)
echo 'graph_args --base 1000 -l 0'
# The Y-axis label
- echo 'graph_vlabel interrupts & ctx switches / ${graph_period}'
+ echo 'graph_vlabel interrupts & ctx switches / ${graph_period}'
# Graph category
echo 'graph_category system'
# Graph information
Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/F-8/munin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- munin.spec 4 Dec 2007 00:49:37 -0000 1.12
+++ munin.spec 28 Dec 2007 18:38:48 -0000 1.13
@@ -1,6 +1,6 @@
Name: munin
Version: 1.2.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Network-wide graphing framework (grapher/gatherer)
License: GPLv2 and Bitstream Vera
Group: System Environment/Daemons
@@ -17,6 +17,7 @@
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
BuildArchitectures: noarch
Requires: perl-HTML-Template
Requires: perl-Net-Server perl-Net-SNMP
@@ -75,6 +76,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
@@ -226,6 +228,9 @@
%doc %{_mandir}/man5/munin-node*
%changelog
+* 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.
- Previous message: rpms/php-magickwand/devel .cvsignore, 1.2, 1.3 php-magickwand.spec, 1.3, 1.4 sources, 1.2, 1.3
- Next message: rpms/grads/EL-5 grads-build_system.patch, NONE, 1.1 grads-dap_build_fixes.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 grads.spec, 1.19, 1.20 libdap.m4, 1.1, 1.2 libnc-dap.m4, 1.2, 1.3 sources, 1.2, 1.3 grads-build_fixes.diff, 1.2, NONE grads-conditionnal_lats.diff, 1.1, NONE grads_dap-no_lats.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list