diff --git a/collectd.spec b/collectd.spec index d9602e6..95aec77 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: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Group: System Environment/Daemons URL: https://collectd.org/ @@ -176,14 +176,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This plugin collects data provided by spamassassin. -%ifnarch ppc64le %package generic-jmx Summary: Generic JMX plugin for collectd Group: System Environment/Daemons Requires: %{name}%{?_isa} = %{version}-%{release} %description generic-jmx This plugin collects data provided by JMX. -%endif %package gmond @@ -239,7 +237,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This plugin collects data from IPVS. -%ifnarch ppc64le %package java Summary: Java bindings for collectd Group: System Environment/Daemons @@ -248,7 +245,6 @@ BuildRequires: java-devel BuildRequires: jpackage-utils %description java These are the Java bindings for collectd. -%endif %package -n libcollectdclient @@ -665,11 +661,7 @@ touch src/pinba.proto --disable-xencpu \ %endif --disable-zone \ -%ifnarch ppc64le --with-java=%{java_home}/ \ -%else - --disable-java \ -%endif --with-python=%{_bindir}/python3 \ --with-perl-bindings=INSTALLDIRS=vendor \ --disable-werror \ @@ -730,11 +722,7 @@ EOF done # *.la files shouldn't be distributed. -rm -f %{buildroot}%{_libdir}/{collectd/,}*.la - -%ifarch ppc64le -rm -f %{buildroot}%{_mandir}/man5/collectd-java.5* -%endif +rm -f %{buildroot}/%{_libdir}/{collectd/,}*.la %check @@ -953,10 +941,8 @@ make check %doc %{_mandir}/man5/collectd-email.5* -%ifnarch ppc64le %files generic-jmx %{_datadir}/collectd/java/generic-jmx.jar -%endif %files gmond @@ -984,14 +970,11 @@ make check %{_libdir}/collectd/ipvs.so -%ifnarch ppc64le %files java %{_libdir}/collectd/java.so %dir %{_datadir}/collectd/java/ %{_datadir}/collectd/java/collectd-api.jar %doc %{_mandir}/man5/collectd-java.5* -%endif - %files log_logstash %{_libdir}/collectd/log_logstash.so @@ -1172,6 +1155,9 @@ make check %changelog +* Thu Jul 13 2017 Ruben Kerkhof - 5.7.2-7 +- Re-enable java plugin on ppc64le + * Fri Jul 07 2017 Ruben Kerkhof - 5.7.2-6 - Disable java plugin on ppc64le for now, javac segfaults.