- New upstream version 4.10.1

  http://collectd.org/news.shtml#news85

- Update patches

6 files changed, 29 insertions, 49 deletions

diff --git a/.gitignore b/.gitignore
index 34f33d3..2d68fc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-collectd-4.10.0.tar.bz2
+collectd-4.10.1.tar.bz2
diff --git a/collectd-4.10.0-include-collectd.d.patch b/collectd-4.10.0-include-collectd.d.patch
deleted file mode 100644
index 8039312..0000000
--- a/collectd-4.10.0-include-collectd.d.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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-4.10.1-include-collectd.d.patch b/collectd-4.10.1-include-collectd.d.patch
new file mode 100644
index 0000000..2e919a5
--- /dev/null
+++ b/collectd-4.10.1-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@LoadPlugin python
+ #@BUILD_PLUGIN_ROUTEROS_TRUE@LoadPlugin routeros
+ #@BUILD_PLUGIN_RRDCACHED_TRUE@LoadPlugin rrdcached
+-@LOAD_PLUGIN_RRDTOOL@LoadPlugin rrdtool
++#@LOAD_PLUGIN_RRDTOOL@LoadPlugin rrdtool
+ #@BUILD_PLUGIN_SENSORS_TRUE@LoadPlugin sensors
+ #@BUILD_PLUGIN_SERIAL_TRUE@LoadPlugin serial
+ #@BUILD_PLUGIN_SNMP_TRUE@LoadPlugin snmp
+@@ -758,6 +758,7 @@
+ #	CreateFiles true
+ #	CollectStatistics true
+ #</Plugin>
++Include "/etc/collectd.d"
+ 
+ #<Plugin rrdtool>
+ #	DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd"
diff --git a/collectd-4.6.2-configure-OpenIPMI.patch b/collectd-4.6.2-configure-OpenIPMI.patch
deleted file mode 100644
index 8913ef9..0000000
--- a/collectd-4.6.2-configure-OpenIPMI.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up ./configure.orig ./configure
---- ./configure.orig	2009-09-10 14:22:48.000000000 -0400
-+++ ./configure	2009-09-11 19:39:02.408651561 -0400
-@@ -27913,7 +27913,7 @@ if test "x$with_libopenipmipthread" = "x
- 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
-+	$PKG_CONFIG --exists OpenIPMI 2>/dev/null
- 	if test "$?" != "0"
- 	then
- 		with_libopenipmipthread="no ($PKG_CONFIG doesn't know OpenIPMIpthread)"
-@@ -27926,7 +27926,7 @@ if test "x$with_libopenipmipthread" = "x
- 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`"
-+	temp_result="`$PKG_CONFIG --cflags OpenIPMI`"
- 	if test "$?" = "0"
- 	then
- 		with_libopenipmipthread_cflags="$temp_result"
-@@ -27942,7 +27942,7 @@ if test "x$with_libopenipmipthread" = "x
- 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`"
-+	temp_result="`$PKG_CONFIG --libs OpenIPMI`"
- 	if test "$?" = "0"
- 	then
- 		with_libopenipmipthread_ldflags="$temp_result"
diff --git a/collectd.spec b/collectd.spec
index ed038f0..2036adc 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,7 +1,7 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
-Version: 4.10.0
-Release: 3%{?dist}
+Version: 4.10.1
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://collectd.org/
@@ -9,9 +9,7 @@ URL: http://collectd.org/
 Source: http://collectd.org/files/%{name}-%{version}.tar.bz2
 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
+Patch1: %{name}-%{version}-include-collectd.d.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -177,7 +175,6 @@ 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
@@ -188,6 +185,7 @@ sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
     --disable-ascent \
     --disable-static \
     --disable-ipvs \
+    --disable-notify_desktop \
     --enable-mysql \
 %ifnarch ppc ppc64 sparc sparc64
     --enable-sensors \
@@ -397,7 +395,6 @@ fi
 %doc %{_mandir}/man5/collectd-java.5*
 %doc %{_mandir}/man5/collectd-python.5*
 %doc %{_mandir}/man5/collectd-unixsock.5*
-%doc %{_mandir}/man5/collectd-python.5*
 %doc %{_mandir}/man5/types.db.5*
 
 %files apache
@@ -501,6 +498,10 @@ fi
 %endif
 
 %changelog
+* Thu Nov 04 2010 Alan Pevec <apevec@redhat.com> 4.10.1-1
+- New upstream version 4.10.1
+  http://collectd.org/news.shtml#news85
+
 * Sat Oct 30 2010 Richard W.M. Jones <rjones@redhat.com> 4.10.0-3
 - Bump and rebuild for updated libnetsnmp.so.
 
diff --git a/sources b/sources
index 1cde67b..7973ad9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2f671d267bf6cb1a9d385107ba7b734d  collectd-4.10.0.tar.bz2
+8cd79b4ebdb9dbeb51ba52d3463a06ef  collectd-4.10.1.tar.bz2