X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=contrib%2Fredhat%2Fcollectd.spec;h=6f86b7e8429f9d533af8b4fada17c737a9f12351;hp=66d1914e06297f0c0a0480e1aa31999503a5e56d;hb=d486225f89ea52d8ed2b4242eba2ad94c409f837;hpb=4380983e0a45e2d1c1207dbea95863d1dcc844c6 diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec index 66d1914e..6f86b7e8 100644 --- a/contrib/redhat/collectd.spec +++ b/contrib/redhat/collectd.spec @@ -16,7 +16,7 @@ # # - fetch the desired collectd release file from https://collectd.org/files/ # and save it in your ~/rpmbuild/SOURCES/ directory (or build your own out of -# the git repository: ./build.sh && ./configure && make-dist-bz2) +# the git repository: ./build.sh && ./configure && make dist) # # - copy this file in your ~/rpmbuild/SPECS/ directory. Make sure the # "Version:" tag matches the version from the tarball. @@ -38,9 +38,13 @@ %global _hardened_build 1 %{?perl_default_filter} +# disable collectd debug by default +%bcond_with debug + # plugins enabled by default %define with_aggregation 0%{!?_without_aggregation:1} %define with_amqp 0%{!?_without_amqp:1} +%define with_amqp1 0%{!?_without_amqp1:1} %define with_apache 0%{!?_without_apache:1} %define with_apcups 0%{!?_without_apcups:1} %define with_ascent 0%{!?_without_ascent:1} @@ -130,6 +134,7 @@ %define with_snmp_agent 0%{!?_without_snmp_agent:1} %define with_statsd 0%{!?_without_statsd:1} %define with_swap 0%{!?_without_swap:1} +%define with_synproxy 0%{!?_without_synproxy:0} %define with_syslog 0%{!?_without_syslog:1} %define with_table 0%{!?_without_table:1} %define with_tail 0%{!?_without_tail:1} @@ -247,7 +252,7 @@ Summary: Statistics collection and monitoring daemon Name: collectd Version: 5.7.1 -Release: 7%{?dist} +Release: 9%{?dist} URL: https://collectd.org Source: https://collectd.org/files/%{name}-%{version}.tar.bz2 License: GPLv2 @@ -276,13 +281,24 @@ every 10 seconds by default. %if %{with_amqp} %package amqp -Summary: AMQP plugin for collectd +Summary: AMQP 0.9 plugin for collectd Group: System Environment/Daemons Requires: %{name}%{?_isa} = %{version}-%{release} BuildRequires: librabbitmq-devel %description amqp -The AMQP plugin transmits or receives values collected by collectd via the -Advanced Message Queuing Protocol (AMQP). +The AMQP 0.9 plugin transmits or receives values collected by collectd via the +Advanced Message Queuing Protocol v0.9 (AMQP). +%endif + +%if %{with_amqp1} +%package amqp1 +Summary: AMQP 1.0 plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: qpid-proton-c-devel +%description amqp1 +The AMQP 1.0 plugin transmits or receives values collected by collectd via the +Advanced Message Queuing Protocol v1.0 (AMQP1). %endif %if %{with_apache} @@ -521,8 +537,8 @@ the byte- and packet-counters of selected rules and submit them to collectd. Summary: Java plugin for collectd Group: System Environment/Daemons Requires: %{name}%{?_isa} = %{version}-%{release} -BuildRequires: java-devel, jpackage-utils -Requires: java, jpackage-utils +BuildRequires: java-devel >= 1.6, jpackage-utils >= 1.6 +Requires: java >= 1.6, jpackage-utils >= 1.6 %description java This plugin for collectd allows plugins to be written in Java and executed in an embedded JVM. @@ -1014,6 +1030,12 @@ Collectd utilities %define _with_amqp --disable-amqp %endif +%if %{with_amqp1} +%define _with_amqp1 --enable-amqp1 +%else +%define _with_amqp1 --disable-amqp1 +%endif + %if %{with_apache} %define _with_apache --enable-apache %else @@ -1359,7 +1381,7 @@ Collectd utilities %if %{with_mcelog} %define _with_mcelog --enable-mcelog %else -%define _with_mbmon --disable-mcelog +%define _with_mcelog --disable-mcelog %endif %if %{with_md} @@ -1655,6 +1677,12 @@ Collectd utilities %define _with_swap --disable-swap %endif +%if %{with_synproxy} +%define _with_synproxy --enable-synproxy +%else +%define _with_synproxy --disable-synproxy +%endif + %if %{with_syslog} %define _with_syslog --enable-syslog %else @@ -1865,8 +1893,15 @@ Collectd utilities %define _with_zookeeper --disable-zookeeper %endif +%if %{with debug} +%define _feature_debug --enable-debug +%else +%define _feature_debug --disable-debug +%endif + %configure CFLAGS="%{optflags} -DLT_LAZY_OR_NOW=\"RTLD_LAZY|RTLD_GLOBAL\"" \ %{?_python_config} \ + %{?_feature_debug} \ --disable-static \ --enable-all-plugins=yes \ --enable-match_empty_counter \ @@ -1881,6 +1916,7 @@ Collectd utilities --enable-target_v5upgrade \ %{?_with_aggregation} \ %{?_with_amqp} \ + %{?_with_amqp1} \ %{?_with_apache} \ %{?_with_apcups} \ %{?_with_apple_sensors} \ @@ -1986,6 +2022,7 @@ Collectd utilities %{?_with_snmp_agent} \ %{?_with_statsd} \ %{?_with_swap} \ + %{?_with_synproxy} \ %{?_with_syslog} \ %{?_with_table} \ %{?_with_tail_csv} \ @@ -2291,6 +2328,9 @@ fi %if %{with_swap} %{_libdir}/%{name}/swap.so %endif +%if %{with_synproxy} +%{_libdir}/%{name}/synproxy.so +%endif %if %{with_syslog} %{_libdir}/%{name}/syslog.so %endif @@ -2367,6 +2407,9 @@ fi %{_includedir}/collectd/network_buffer.h %{_includedir}/collectd/lcc_features.h %{_libdir}/pkgconfig/libcollectdclient.pc +%{_includedir}/collectd/network_parse.h +%{_includedir}/collectd/server.h +%{_includedir}/collectd/types.h %{_libdir}/libcollectdclient.so %files -n libcollectdclient @@ -2385,6 +2428,11 @@ fi %{_libdir}/%{name}/amqp.so %endif +%if %{with_amqp1} +%files amqp1 +%{_libdir}/%{name}/amqp1.so +%endif + %if %{with_apache} %files apache %{_libdir}/%{name}/apache.so @@ -2723,6 +2771,15 @@ fi %doc contrib/ %changelog +* Thu Sep 28 2017 Jakub Jankowski - 5.7.1-9 +- Fix mbmon/mcelog build options + +* Thu Sep 28 2017 xakru - 5.7.1-8 +- Add new libcollectdclient/network_parse +- Add new libcollectdclient/server +- Add new libcollectdclient/types +- Add new synproxy plugin + * Fri Aug 18 2017 Ruben Kerkhof - 5.7.1-7 - Add new intel_pmu plugin