The package rpms/collectd.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/collectd.git/commit/?id=0a930dd9d....
Change:
-%ifnarch s390 s390x
Thanks.
Full change:
============
commit 0a930dd9dbeb2efed2fa06e8841293c0791183a4
Author: Ruben Kerkhof <ruben(a)rubenkerkhof.com>
Date: Mon Oct 2 16:21:21 2017 +0200
Enable ping plugin again (#1478736)
Enable mqtt plugin again
Disable nut plugin due to file conflicts (#1497103)
diff --git a/collectd.spec b/collectd.spec
index 2543650..08e530e 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -3,7 +3,7 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
Version: 5.7.2
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL:
https://collectd.org/
@@ -310,6 +310,15 @@ This plugin connects to a Modbus "slave" via Modbus/TCP
and reads register values.
+%package mqtt
+Summary: MQTT plugin for collectd
+Group: System Environment/Daemons
+Requires: %{name}%{?_isa} = %{version}-%{release}
+BuildRequires: mosquitto-devel
+%description mqtt
+The MQTT plugin publishes and subscribes to MQTT topics.
+
+
%package mysql
Summary: MySQL plugin for collectd
Group: System Environment/Daemons
@@ -358,17 +367,6 @@ This plugin uses the ESMTP library to send
notifications to a configured email address.
-%ifnarch s390 s390x
-%package nut
-Summary: Network UPS Tools plugin for collectd
-Group: System Environment/Daemons
-Requires: %{name}%{?_isa} = %{version}-%{release}
-BuildRequires: nut-devel
-%description nut
-This plugin for collectd provides Network UPS Tools support.
-%endif
-
-
%package onewire
Summary: OneWire bus plugin for collectd
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -407,6 +405,15 @@ This plugin receives profiling information from Pinba,
an extension for the PHP interpreter.
+%package ping
+Summary: Ping plugin for collectd
+Group: System Environment/Daemons
+Requires: %{name}%{?_isa} = %{version}-%{release}
+BuildRequires: liboping-devel
+%description ping
+This plugin for collectd provides network latency statistics.
+
+
%package postgresql
Summary: PostgreSQL plugin for collectd
Group: System Environment/Daemons
@@ -632,13 +639,9 @@ touch src/pinba.proto
--disable-intel_rdt \
--disable-lpar \
--disable-mic \
- --disable-mqtt \
--disable-netapp \
-%ifarch s390 s390x
--disable-nut \
-%endif
--disable-oracle \
- --disable-ping \
--disable-pf \
--disable-routeros \
%ifarch ppc sparc sparc64
@@ -703,9 +706,9 @@ cp %{SOURCE98} %{buildroot}%{_sysconfdir}/collectd.d/onewire.conf
# configs for subpackaged plugins
%ifnarch s390 s390x
-for p in dns ipmi libvirt nut perl postgresql
+for p in dns ipmi libvirt perl ping postgresql
%else
-for p in dns ipmi libvirt perl postgresql
+for p in dns ipmi libvirt perl ping postgresql
%endif
do
cat > %{buildroot}%{_sysconfdir}/collectd.d/$p.conf <<EOF
@@ -751,10 +754,10 @@ make check
%exclude %{_sysconfdir}/collectd.d/mysql.conf
%exclude %{_sysconfdir}/collectd.d/nginx.conf
%ifnarch s390 s390x
-%exclude %{_sysconfdir}/collectd.d/nut.conf
%endif
%exclude %{_sysconfdir}/collectd.d/onewire.conf
%exclude %{_sysconfdir}/collectd.d/perl.conf
+%exclude %{_sysconfdir}/collectd.d/ping.conf
%exclude %{_sysconfdir}/collectd.d/postgresql.conf
%exclude %{_datadir}/collectd/postgresql_default.conf
%exclude %{_sysconfdir}/collectd.d/rrdtool.conf
@@ -989,6 +992,10 @@ make check
%{_libdir}/collectd/modbus.so
+%files mqtt
+%{_libdir}/collectd/mqtt.so
+
+
%files mysql
%{_libdir}/collectd/mysql.so
%config(noreplace) %{_sysconfdir}/collectd.d/mysql.conf
@@ -1011,13 +1018,6 @@ make check
%{_libdir}/collectd/notify_email.so
-%ifnarch s390 s390x
-%files nut
-%{_libdir}/collectd/nut.so
-%config(noreplace) %{_sysconfdir}/collectd.d/nut.conf
-%endif
-
-
%files onewire
%{_libdir}/collectd/onewire.so
%config(noreplace) %{_sysconfdir}/collectd.d/onewire.conf
@@ -1041,6 +1041,11 @@ make check
%{_libdir}/collectd/pinba.so
+%files ping
+%{_libdir}/collectd/ping.so
+%config(noreplace) %{_sysconfdir}/collectd.d/ping.conf
+
+
%files postgresql
%{_libdir}/collectd/postgresql.so
%config(noreplace) %{_sysconfdir}/collectd.d/postgresql.conf
@@ -1143,6 +1148,11 @@ make check
%changelog
+* Mon Oct 02 2017 Ruben Kerkhof <ruben(a)rubenkerkhof.com> - 5.7.2-6
+- Enable ping plugin again (#1478736)
+- Enable mqtt plugin again
+- Disable nut plugin due to file conflicts (#1497103)
+
* Sun Jun 18 2017 Ruben Kerkhof <ruben(a)rubenkerkhof.com> - 5.7.2-5
- Disable mqtt plugin until mosquitto is fixed