diff options
-rw-r--r-- | collectd.spec | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/collectd.spec b/collectd.spec index b6ef3e5..abf0d94 100644 --- a/collectd.spec +++ b/collectd.spec @@ -1,7 +1,7 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd Version: 4.9.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://collectd.org/ @@ -33,9 +33,7 @@ BuildRequires: libpcap-devel BuildRequires: mysql-devel BuildRequires: OpenIPMI-devel BuildRequires: postgresql-devel -# fc14 and later have nut 2.6 which fails collectd check: -# libupsclient . . . . no (symbol upscli_connect not found) -%if 0%{?fedora} < 14 +%ifnarch s390 s390x BuildRequires: nut-devel %endif BuildRequires: iptables-devel @@ -100,7 +98,7 @@ Requires: collectd = %{version}-%{release} This plugin gets data provided by nginx. -%if 0%{?fedora} < 14 +%ifnarch s390 s390x %package nut Summary: Network UPS Tools module for collectd Group: System Environment/Daemons @@ -257,10 +255,10 @@ sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in --enable-nfs \ --enable-nginx \ --enable-ntpd \ -%if 0%{?fedora} >= 14 - --disable-nut \ -%else +%ifnarch s390 s390x --enable-nut \ +%else + --disable-nut \ %endif --enable-olsrd \ --enable-openvpn \ @@ -352,10 +350,10 @@ 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 +%ifnarch s390 s390x for p in dns ipmi libvirt nut perl ping postgresql rrdtool +%else +for p in dns ipmi libvirt perl ping postgresql rrdtool %endif do %{__cat} > %{buildroot}/etc/collectd.d/$p.conf <<EOF @@ -399,7 +397,7 @@ fi %exclude %{_sysconfdir}/collectd.d/libvirt.conf %exclude %{_sysconfdir}/collectd.d/mysql.conf %exclude %{_sysconfdir}/collectd.d/nginx.conf -%if 0%{?fedora} < 14 +%ifarch s390 s390x %exclude %{_sysconfdir}/collectd.d/nut.conf %endif %exclude %{_sysconfdir}/collectd.d/perl.conf @@ -537,7 +535,7 @@ fi %config(noreplace) %{_sysconfdir}/collectd.d/nginx.conf -%if 0%{?fedora} < 14 +%ifnarch s390 s390x %files nut %defattr(-, root, root, -) %{_libdir}/collectd/nut.so @@ -603,6 +601,9 @@ fi %endif %changelog +* Wed Apr 20 2011 Alan Pevec <apevec@redhat.com> 4.9.5-2 +- re-enable nut plugin rhbz#465729 rhbz#691380 + * Tue Mar 29 2011 Alan Pevec <apevec@redhat.com> 4.9.5-1 - new upstream version 4.9.5 http://collectd.org/news.shtml#news87 |