[collectd/f15/master] - new upstream version 4.10.3

[Alan Pevec]

commit af8d4dbc7b7971917d3426a79f7393977ec68962
Author: Alan Pevec <apevec at redhat.com>
Date:   Tue Mar 29 14:34:27 2011 +0200

    - new upstream version 4.10.3
    
      http://collectd.org/news.shtml#news87
    - disable nut 2.6 which fails collectd check:
      libupsclient  . . . . no (symbol upscli_connect not found)
      (reopens BZ#465729)

 .gitignore                       |    1 +
 collectd-4.10.2-iptc-check.patch |   20 --------------------
 collectd-4.10.3-iptc-check.patch |   20 ++++++++++++++++++++
 collectd.spec                    |   32 +++++++++++++++++++++++++-------
 sources                          |    2 +-
 5 files changed, 47 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9fbba89..28301fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 collectd-4.10.1.tar.bz2
 /collectd-4.10.2.tar.bz2
+/collectd-4.10.3.tar.bz2
diff --git a/collectd-4.10.3-iptc-check.patch b/collectd-4.10.3-iptc-check.patch
new file mode 100644
index 0000000..606f1d5
--- /dev/null
+++ b/collectd-4.10.3-iptc-check.patch
@@ -0,0 +1,20 @@
+--- 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 829851d..54717b7 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,7 +1,7 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
-Version: 4.10.2
-Release: 4%{?dist}
+Version: 4.10.3
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://collectd.org/
@@ -9,7 +9,7 @@ URL: http://collectd.org/
 Source: http://collectd.org/files/%{name}-%{version}.tar.bz2
 Source1: collectd-httpd.conf
 Source2: collection.conf
-Patch1: %{name}-%{version}-include-collectd.d.patch
+Patch1: %{name}-4.10.2-include-collectd.d.patch
 Patch2: %{name}-%{version}-iptc-check.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -33,7 +33,11 @@ BuildRequires: libpcap-devel
 BuildRequires: mysql-devel
 BuildRequires: OpenIPMI-devel
 BuildRequires: postgresql-devel
-%ifnarch s390 s390x
+# fc14 and later have nut 2.6 which fails collectd check:
+#  libupsclient  . . . . no (symbol upscli_connect not found)
+# Also, no nut on 390* was: %ifnarch s390 s390x
+# assuming there will be no 390* builds on fc14 or older
+%if 0%{?fedora} < 14
 BuildRequires: nut-devel
 %endif
 BuildRequires: iptables-devel
@@ -98,7 +102,7 @@ Requires:      collectd = %{version}-%{release}
 This plugin gets data provided by nginx.
 
 
-%ifnarch s390 s390x
+%if 0%{?fedora} < 14
 %package nut
 Summary:       Network UPS Tools module for collectd
 Group:         System Environment/Daemons
@@ -254,7 +258,9 @@ sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
     --enable-nfs \
     --enable-nginx \
     --enable-ntpd \
-%ifnarch s390 s390x
+%if 0%{?fedora} >= 14
+    --disable-nut \
+%else
     --enable-nut \
 %endif
     --enable-olsrd \
@@ -347,7 +353,11 @@ cp contrib/redhat/sensors.conf %{buildroot}/etc/collectd.d/sensors.conf
 cp contrib/redhat/snmp.conf %{buildroot}/etc/collectd.d/snmp.conf
 
 # configs for subpackaged plugins
+%if 0%{?fedora} >= 14
+for p in dns ipmi libvirt perl ping postgresql rrdtool
+%else
 for p in dns ipmi libvirt nut perl ping postgresql rrdtool
+%endif
 do
 %{__cat} > %{buildroot}/etc/collectd.d/$p.conf <<EOF
 LoadPlugin $p
@@ -390,7 +400,9 @@ fi
 %exclude %{_sysconfdir}/collectd.d/libvirt.conf
 %exclude %{_sysconfdir}/collectd.d/mysql.conf
 %exclude %{_sysconfdir}/collectd.d/nginx.conf
+%if 0%{?fedora} < 14
 %exclude %{_sysconfdir}/collectd.d/nut.conf
+%endif
 %exclude %{_sysconfdir}/collectd.d/perl.conf
 %exclude %{_sysconfdir}/collectd.d/ping.conf
 %exclude %{_sysconfdir}/collectd.d/postgresql.conf
@@ -527,7 +539,7 @@ fi
 %config(noreplace) %{_sysconfdir}/collectd.d/nginx.conf
 
 
-%ifnarch s390 s390x
+%if 0%{?fedora} < 14
 %files nut
 %defattr(-, root, root, -)
 %{_libdir}/collectd/nut.so
@@ -593,6 +605,12 @@ fi
 %endif
 
 %changelog
+* Tue Mar 29 2011 Alan Pevec <apevec at redhat.com> 4.10.3-1
+- new upstream version 4.10.3
+  http://collectd.org/news.shtml#news87
+- disable nut 2.6 which fails collectd check:
+  libupsclient  . . . . no (symbol upscli_connect not found)
+
 * Wed Mar 23 2011 Dan Horák <dan at danny.cz> - 4.10.2-4
 - rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
 
diff --git a/sources b/sources
index 44676db..4c41b1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-85d9d8d0a1327782661e3c89800aa70e  collectd-4.10.2.tar.bz2
+5f17bfd7342af4f97f78c608f1d1eb1d  collectd-4.10.3.tar.bz2