[collectd] - no nut on s390(x)
Dan Horák
sharkcz at fedoraproject.org
Fri Jan 7 08:13:43 UTC 2011
commit 7f8757a062b8fa820145ece6f1a717a516a20893
Author: Dan Horák <dan at danny.cz>
Date: Fri Jan 7 09:13:32 2011 +0100
- no nut on s390(x)
collectd.spec | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/collectd.spec b/collectd.spec
index 0038c7b..692ec98 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: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL: http://collectd.org/
@@ -33,7 +33,9 @@ BuildRequires: libpcap-devel
BuildRequires: mysql-devel
BuildRequires: OpenIPMI-devel
BuildRequires: postgresql-devel
+%ifnarch 390 s390x
BuildRequires: nut-devel
+%endif
BuildRequires: iptables-devel
BuildRequires: liboping-devel
BuildRequires: python-devel
@@ -96,12 +98,14 @@ Requires: collectd = %{version}-%{release}
This plugin gets data provided by nginx.
+%ifnarch s390 s390x
%package nut
Summary: Network UPS Tools module for collectd
Group: System Environment/Daemons
Requires: collectd = %{version}-%{release}
%description nut
This plugin for collectd provides Network UPS Tools support.
+%endif
%package -n perl-Collectd
@@ -250,7 +254,9 @@ sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
--enable-nfs \
--enable-nginx \
--enable-ntpd \
+%ifnarch s390 s390x
--enable-nut \
+%endif
--enable-olsrd \
--enable-openvpn \
--enable-perl \
@@ -521,10 +527,12 @@ fi
%config(noreplace) %{_sysconfdir}/collectd.d/nginx.conf
+%ifnarch s390 s390x
%files nut
%defattr(-, root, root, -)
%{_libdir}/collectd/nut.so
%config(noreplace) %{_sysconfdir}/collectd.d/nut.conf
+%endif
%files -n perl-Collectd
@@ -585,6 +593,9 @@ fi
%endif
%changelog
+* Fri Jan 07 2011 Dan Horák <dan[at]danny.cz> 4.10.2-2
+- no nut on s390(x)
+
* Thu Dec 16 2010 Alan Pevec <apevec at redhat.com> 4.10.2-1
- New upstream version 4.10.2
- http://collectd.org/news.shtml#news86
More information about the scm-commits
mailing list