[fedora-virt-maint] [collectd/el6/master] Add patches too

[Kevin Fenzi]

commit 0adbaac3402801d0249adbc2e327f5748a1965d0
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Thu Mar 24 10:03:39 2011 -0600

    Add patches too

 collectd-4.10.2-configure-OpenIPMI.patch |   70 ++++++++++++++++++++++++++++++
 collectd-4.10.2-include-collectd.d.patch |   19 ++++++++
 2 files changed, 89 insertions(+), 0 deletions(-)
---
diff --git a/collectd-4.10.2-configure-OpenIPMI.patch b/collectd-4.10.2-configure-OpenIPMI.patch
new file mode 100644
index 0000000..9bf8680
--- /dev/null
+++ b/collectd-4.10.2-configure-OpenIPMI.patch
@@ -0,0 +1,70 @@
+--- configure.orig	2010-11-27 11:10:52.000000000 +0100
++++ configure	2010-12-17 11:51:20.924320896 +0100
+@@ -22796,7 +22796,7 @@
+ fi
+ # }}}
+ 
+-# $PKG_CONFIG --exists OpenIPMIpthread {{{
++# $PKG_CONFIG --exists OpenIPMI {{{
+ with_libopenipmipthread="yes"
+ with_libopenipmipthread_cflags=""
+ with_libopenipmipthread_libs=""
+@@ -22816,12 +22816,12 @@
+ 
+ if test "x$with_libopenipmipthread" = "xyes"
+ then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libOpenIPMIpthread" >&5
+-$as_echo_n "checking for libOpenIPMIpthread... " >&6; }
+-	$PKG_CONFIG --exists OpenIPMIpthread 2>/dev/null
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libOpenIPMI" >&5
++$as_echo_n "checking for libOpenIPMI... " >&6; }
++	$PKG_CONFIG --exists OpenIPMI 2>/dev/null
+ 	if test "$?" != "0"
+ 	then
+-		with_libopenipmipthread="no ($PKG_CONFIG doesn't know OpenIPMIpthread)"
++		with_libopenipmipthread="no ($PKG_CONFIG doesn't know OpenIPMI)"
+ 	fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libopenipmipthread" >&5
+ $as_echo "$with_libopenipmipthread" >&6; }
+@@ -22829,15 +22829,15 @@
+ 
+ if test "x$with_libopenipmipthread" = "xyes"
+ then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libOpenIPMIpthread CFLAGS" >&5
+-$as_echo_n "checking for libOpenIPMIpthread CFLAGS... " >&6; }
+-	temp_result="`$PKG_CONFIG --cflags OpenIPMIpthread`"
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libOpenIPMI CFLAGS" >&5
++$as_echo_n "checking for libOpenIPMI CFLAGS... " >&6; }
++	temp_result="`$PKG_CONFIG --cflags OpenIPMI`"
+ 	if test "$?" = "0"
+ 	then
+ 		with_libopenipmipthread_cflags="$temp_result"
+ 	else
+-		with_libopenipmipthread="no ($PKG_CONFIG --cflags OpenIPMIpthread failed)"
+-		temp_result="$PKG_CONFIG --cflags OpenIPMIpthread failed"
++		with_libopenipmipthread="no ($PKG_CONFIG --cflags OpenIPMI failed)"
++		temp_result="$PKG_CONFIG --cflags OpenIPMI failed"
+ 	fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $temp_result" >&5
+ $as_echo "$temp_result" >&6; }
+@@ -22845,15 +22845,15 @@
+ 
+ if test "x$with_libopenipmipthread" = "xyes"
+ then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libOpenIPMIpthread LDFLAGS" >&5
+-$as_echo_n "checking for libOpenIPMIpthread LDFLAGS... " >&6; }
+-	temp_result="`$PKG_CONFIG --libs OpenIPMIpthread`"
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libOpenIPMI LDFLAGS" >&5
++$as_echo_n "checking for libOpenIPMI LDFLAGS... " >&6; }
++	temp_result="`$PKG_CONFIG --libs OpenIPMI`"
+ 	if test "$?" = "0"
+ 	then
+ 		with_libopenipmipthread_ldflags="$temp_result"
+ 	else
+-		with_libopenipmipthread="no ($PKG_CONFIG --libs OpenIPMIpthread failed)"
+-		temp_result="$PKG_CONFIG --libs OpenIPMIpthread failed"
++		with_libopenipmipthread="no ($PKG_CONFIG --libs OpenIPMI failed)"
++		temp_result="$PKG_CONFIG --libs OpenIPMI failed"
+ 	fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $temp_result" >&5
+ $as_echo "$temp_result" >&6; }
diff --git a/collectd-4.10.2-include-collectd.d.patch b/collectd-4.10.2-include-collectd.d.patch
new file mode 100644
index 0000000..2e919a5
--- /dev/null
+++ b/collectd-4.10.2-include-collectd.d.patch
@@ -0,0 +1,19 @@
+--- 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
+ #@BUILD_PLUGIN_ROUTEROS_TRUE at LoadPlugin routeros
+ #@BUILD_PLUGIN_RRDCACHED_TRUE at LoadPlugin rrdcached
+- at LOAD_PLUGIN_RRDTOOL@LoadPlugin rrdtool
++#@LOAD_PLUGIN_RRDTOOL at LoadPlugin rrdtool
+ #@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 @@
+ #	CreateFiles true
+ #	CollectStatistics true
+ #</Plugin>
++Include "/etc/collectd.d"
+ 
+ #<Plugin rrdtool>
+ #	DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd"