- 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)

1 files changed, 25 insertions, 7 deletions

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@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@danny.cz> - 4.10.2-4
 - rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)