ci/utility/collectd.spec.patch

   1 diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec
   2 index 4721d47f..ca9929db 100644
   3 --- a/contrib/redhat/collectd.spec
   4 +++ b/contrib/redhat/collectd.spec
   5 @@ -96,6 +96,7 @@
   6  %define with_mbmon 0%{!?_without_mbmon:1}
   7  %define with_mcelog 0%{!?_without_mcelog:1}
   8  %define with_md 0%{!?_without_md:1}
   9 +%define with_mdevents 0%{!?_without_mdevents:1}
  10  %define with_memcachec 0%{!?_without_memcachec:1}
  11  %define with_memcached 0%{!?_without_memcached:1}
  12  %define with_memory 0%{!?_without_memory:1}
  13 @@ -112,7 +113,7 @@
  14  %define with_notify_nagios 0%{!?_without_notify_nagios:1}
  15  %define with_ntpd 0%{!?_without_ntpd:1}
  16  %define with_numa 0%{!?_without_numa:1}
  17 -%define with_nut 0%{!?_without_nut:1}
  18 +%define with_nut 0%{!?_without_nut:0}
  19  %define with_olsrd 0%{!?_without_olsrd:1}
  20  %define with_openldap 0%{!?_without_openldap:1}
  21  %define with_openvpn 0%{!?_without_openvpn:1}
  22 @@ -154,7 +155,7 @@
  23  %define with_uptime 0%{!?_without_uptime:1}
  24  %define with_users 0%{!?_without_users:1}
  25  %define with_uuid 0%{!?_without_uuid:1}
  26 -%define with_varnish 0%{!?_without_varnish:1}
  27 +%define with_varnish 0%{!?_without_varnish:0}
  28  %define with_virt 0%{!?_without_virt:1}
  29  %define with_vmem 0%{!?_without_vmem:1}
  30  %define with_vserver 0%{!?_without_vserver:1}
  31 @@ -195,7 +196,7 @@
  32  # plugin intel_pmu disabled, requires libjevents
  33  %define with_intel_pmu 0%{!?_without_intel_pmu:0}
  34  # plugin intel_rdt disabled, requires intel-cmt-cat
  35 -%define with_intel_rdt 0%{!?_without_intel_rdt:0}
  36 +%define with_intel_rdt 0%{!?_without_intel_rdt:1}
  37  # plugin mic disabled, requires Mic
  38  %define with_mic 0%{!?_without_mic:0}
  39  # plugin netapp disabled, requires libnetapp
  40 @@ -643,7 +644,7 @@ The modbus plugin collects values from Modbus/TCP enabled devices
  41  Summary:       MySQL plugin for collectd
  42  Group:         System Environment/Daemons
  43  Requires:      %{name}%{?_isa} = %{version}-%{release}
  44 -BuildRequires: mysql-devel
  45 +BuildRequires:  mariadb-connector-c-devel
  46  %description mysql
  47  MySQL querying plugin. This plugin provides data of issued commands, called
  48  handlers and database traffic.
  49 @@ -1503,6 +1504,12 @@ Collectd utilities
  50  %define _with_md --disable-md
  51  %endif
  52
  53 +%if %{with_mdevents}
  54 +%define _with_mdevents --enable-mdevents
  55 +%else
  56 +%define _with_mdevents --disable-mdevents
  57 +%endif
  58 +
  59  %if %{with_memcachec}
  60  %define _with_memcachec --enable-memcachec
  61  %else
  62 @@ -2117,6 +2124,7 @@ Collectd utilities
  63         %{?_with_grpc} \
  64         %{?_with_hddtemp} \
  65         %{?_with_hugepages} \
  66 +       --disable-infiniband \
  67         %{?_with_intel_pmu} \
  68         %{?_with_intel_rdt} \
  69         %{?_with_interface} \
  70 @@ -2137,6 +2145,7 @@ Collectd utilities
  71         %{?_with_mbmon} \
  72         %{?_with_mcelog} \
  73         %{?_with_md} \
  74 +       %{?_with_mdevents} \
  75         %{?_with_memcachec} \
  76         %{?_with_memcached} \
  77         %{?_with_memory} \
  78 @@ -2146,6 +2155,7 @@ Collectd utilities
  79         %{?_with_multimeter} \
  80         %{?_with_mysql} \
  81         %{?_with_netapp} \
  82 +       --disable-netstat_udp \
  83         %{?_with_netlink} \
  84         %{?_with_network} \
  85         %{?_with_nfs} \
  86 @@ -2453,6 +2463,9 @@ fi
  87  %if %{with_md}
  88  %{_libdir}/%{name}/md.so
  89  %endif
  90 +%if %{with_mdevents}
  91 +%{_libdir}/%{name}/mdevents.so
  92 +%endif
  93  %if %{with_memcached}
  94  %{_libdir}/%{name}/memcached.so
  95  %endif