[collectd] Merged forgotten patches and removed obsolete ones

[Robert Scheck]

commit 4cbb5fb951173fc5205802a9afdab93490f0e1ee
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Sep 19 15:11:12 2010 +0200

    Merged forgotten patches and removed obsolete ones

 collectd-4.10.0-include-collectd.d.patch     |   10 +++
 collectd-4.9.1-include-collectd.d.patch      |   75 -----------------
 collectd.spec                                |    2 +
 libiptc-avoid-strict-aliasing-warnings.patch |  113 --------------------------
 4 files changed, 12 insertions(+), 188 deletions(-)
---
diff --git a/collectd-4.10.0-include-collectd.d.patch b/collectd-4.10.0-include-collectd.d.patch
new file mode 100644
index 0000000..8039312
--- /dev/null
+++ b/collectd-4.10.0-include-collectd.d.patch
@@ -0,0 +1,10 @@
+--- 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
+@@ -709,6 +709,7 @@
+ #	CreateFiles true
+ #	CollectStatistics true
+ #</Plugin>
++Include "/etc/collectd.d"
+ 
+ #<Plugin rrdtool>
+ #	DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd"
diff --git a/collectd.spec b/collectd.spec
index de38baa..6d2d79d 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -11,6 +11,7 @@ Source1: collectd-httpd.conf
 Source2: collection.conf
 # bug 468067 "pkg-config --libs OpenIPMIpthread" fails
 Patch0: %{name}-4.6.2-configure-OpenIPMI.patch
+Patch1: %{name}-4.10.0-include-collectd.d.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -177,6 +178,7 @@ This plugin collects information from virtualized guests.
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 
 sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in