new upstream version 4.10.4

http://mailman.verplant.org/pipermail/collectd/2011-October/004777.html

4 files changed, 9 insertions, 26 deletions

diff --git a/.gitignore b/.gitignore
index 28301fc..a92609c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 collectd-4.10.1.tar.bz2
 /collectd-4.10.2.tar.bz2
 /collectd-4.10.3.tar.bz2
+/collectd-4.10.4.tar.bz2
diff --git a/collectd-4.10.3-iptc-check.patch b/collectd-4.10.3-iptc-check.patch
deleted file mode 100644
index 606f1d5..0000000
--- a/collectd-4.10.3-iptc-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	2011-03-26 17:09:34.000000000 +0100
-+++ configure	2011-03-29 14:23:54.647074988 +0200
-@@ -36343,13 +36343,13 @@
- # Check for the iptc_init symbol in the library.
- if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
- then
--	{ echo "$as_me:$LINENO: checking for iptc_init in -liptc" >&5
--echo $ECHO_N "checking for iptc_init in -liptc... $ECHO_C" >&6; }
--if test "${ac_cv_lib_iptc_iptc_init+set}" = set; then
-+	{ echo "$as_me:$LINENO: checking for iptc_init in -lip4tc" >&5
-+echo $ECHO_N "checking for iptc_init in -lip4tc... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_ip4tc_iptc_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-liptc  $LIBS"
-+LIBS="-liptc -lip6tc -lip4tc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
diff --git a/collectd.spec b/collectd.spec
index a80ef6c..9be7002 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,7 +1,7 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
-Version: 4.10.3
-Release: 8%{?dist}
+Version: 4.10.4
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://collectd.org/
@@ -10,7 +10,6 @@ Source: http://collectd.org/files/%{name}-%{version}.tar.bz2
 Source1: collectd-httpd.conf
 Source2: collection.conf
 Patch1: %{name}-4.10.2-include-collectd.d.patch
-Patch2: %{name}-%{version}-iptc-check.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -182,7 +181,6 @@ This plugin collects information from virtualized guests.
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p0
 
 sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
 
@@ -601,8 +599,12 @@ fi
 %endif
 
 %changelog
+* Mon Nov 28 2011 Alan Pevec <apevec@redhat.com> 4.10.4-1
+- new upstream version 4.10.4
+  http://mailman.verplant.org/pipermail/collectd/2011-October/004777.html
+
 * Fri Jul 29 2011 Kevin Fenzi <kevin@scrye.com> - 4.10.3-8
-- Rebuild for new snmp again. 
+- Rebuild for new snmp again.
 
 * Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 4.10.3-7
 - Perl mass rebuild
diff --git a/sources b/sources
index 4c41b1f..c5b59d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5f17bfd7342af4f97f78c608f1d1eb1d  collectd-4.10.3.tar.bz2
+2ea15851152fcb25ce8f65a5c9dd1df2  collectd-4.10.4.tar.bz2