[collectd] adjust collectd.conf patch for 4.10.4

Alan Pevec apevec at fedoraproject.org
Tue Nov 29 02:00:44 UTC 2011


commit 45a83273949a5ad6398923fa688dad450ea3ba34
Author: Alan Pevec <apevec at redhat.com>
Date:   Tue Nov 29 02:59:26 2011 +0100

    adjust collectd.conf patch for 4.10.4

 ...tch => collectd-4.10.4-include-collectd.d.patch |   10 +++++-----
 collectd.spec                                      |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/collectd-4.10.2-include-collectd.d.patch b/collectd-4.10.4-include-collectd.d.patch
similarity index 68%
rename from collectd-4.10.2-include-collectd.d.patch
rename to collectd-4.10.4-include-collectd.d.patch
index 2e919a5..a37706d 100644
--- a/collectd-4.10.2-include-collectd.d.patch
+++ b/collectd-4.10.4-include-collectd.d.patch
@@ -1,7 +1,7 @@
---- collectd-4.10.0/src/collectd.conf.in	2010-05-01 11:15:45.000000000 +0200
-+++ collectd-4.10.0/src/collectd.conf.in	2010-09-19 15:00:15.893887909 +0200
-@@ -116,7 +116,7 @@
- #@BUILD_PLUGIN_PYTHON_TRUE at LoadPlugin python
+--- collectd-4.10.4/src/collectd.conf.in	2011-10-14 22:46:13.000000000 +0200
++++ collectd-4.10.4/src/collectd.conf.in	2011-11-29 02:53:03.975913077 +0100
+@@ -120,7 +120,7 @@
+ #@BUILD_PLUGIN_PYTHON_TRUE@</LoadPlugin>
  #@BUILD_PLUGIN_ROUTEROS_TRUE at LoadPlugin routeros
  #@BUILD_PLUGIN_RRDCACHED_TRUE at LoadPlugin rrdcached
 - at LOAD_PLUGIN_RRDTOOL@LoadPlugin rrdtool
@@ -9,7 +9,7 @@
  #@BUILD_PLUGIN_SENSORS_TRUE at LoadPlugin sensors
  #@BUILD_PLUGIN_SERIAL_TRUE at LoadPlugin serial
  #@BUILD_PLUGIN_SNMP_TRUE at LoadPlugin snmp
-@@ -758,6 +758,7 @@
+@@ -762,6 +762,7 @@
  #	CreateFiles true
  #	CollectStatistics true
  #</Plugin>
diff --git a/collectd.spec b/collectd.spec
index fd7ff6b..0023a5e 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -10,7 +10,7 @@ Source: http://collectd.org/files/%{name}-%{version}.tar.bz2
 Source1: collectd-httpd.conf
 Source2: collection.conf
 Source3: collectd.service
-Patch1: %{name}-4.10.2-include-collectd.d.patch
+Patch1: %{name}-%{version}-include-collectd.d.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 


More information about the scm-commits mailing list