From c6980ffa5bce59582cce119cd9ed6d8249abfd874c45cf87002921deb94054f6 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Thu, 16 Sep 2021 19:54:15 +0000 Subject: [PATCH] Accepting request 919487 from home:matwey:branches:server:monitoring - Fix version mess introduced (by me) in previous changes. + rabbitmq-c package is available since SLES 15 SP3 so amqp plugin can be enabled for Tumbleweed or Leap 15.3+ + libmodbus package is available in SLES 15 SP4 Backports so modbus plugin can be enabled for Tumbleweed or Leap 15.4+ OBS-URL: https://build.opensuse.org/request/show/919487 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=175 --- collectd.changes | 9 +++++++++ collectd.spec | 16 ++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/collectd.changes b/collectd.changes index b7f7601..96ec39d 100644 --- a/collectd.changes +++ b/collectd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Sep 16 09:29:07 UTC 2021 - Matwey Kornilov + +- Fix version mess introduced in previous changes. + + rabbitmq-c package is available since SLES 15 SP3 + so amqp plugin can be enabled for Tumbleweed or Leap 15.3+ + + libmodbus package is available in SLES 15 SP4 Backports + so modbus plugin can be enabled for Tumbleweed or Leap 15.4+ + ------------------------------------------------------------------- Wed Sep 8 14:08:46 UTC 2021 - Matwey Kornilov diff --git a/collectd.spec b/collectd.spec index eeebc31..7243dc9 100644 --- a/collectd.spec +++ b/collectd.spec @@ -109,7 +109,7 @@ BuildRequires: pkgconfig(libiptc) BuildRequires: pkgconfig(libmemcached) BuildRequires: pkgconfig(libmicrohttpd) BuildRequires: pkgconfig(libmnl) -%if 0%{?suse_version} > 1500 +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400 BuildRequires: pkgconfig(libmodbus) %endif %if 0%{?is_opensuse} @@ -119,7 +119,7 @@ BuildRequires: pkgconfig(libevent) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(liboping) BuildRequires: pkgconfig(libpq) -%if 0%{?suse_version} > 1520 +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300 BuildRequires: pkgconfig(librabbitmq) %endif BuildRequires: pkgconfig(librrd) @@ -187,7 +187,7 @@ a browser. Please look at %{_sysconfdir}/apache2/conf.d/%{name}-js.conf on how to enable. -%if 0%{?suse_version} > 1520 +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300 %package plugin-amqp Summary: AMQP Plugin for %{name} Group: System/Monitoring @@ -314,7 +314,7 @@ Requires: %{name} = %{version}-%{release} %description plugin-memcachec Optional %{name} plugin to sample memcached statistics. -%if 0%{?suse_version} > 1500 +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400 %package plugin-modbus Summary: TCP Modbus Plugin for %{name} Group: System/Monitoring @@ -493,7 +493,7 @@ Optional %{name} plugin to send values to InfluxDB using line protocol via udp Summary: All Monitoring Plugins for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} -%if 0%{?suse_version} > 1520 +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300 Requires: %{name}-plugin-amqp = %{version}-%{release} %endif Requires: %{name}-plugin-buddyinfo = %{version}-%{release} @@ -508,7 +508,7 @@ Requires: %{name}-plugin-logparser = %{version}-%{release} Requires: %{name}-plugin-lua = %{version}-%{release} Requires: %{name}-plugin-mcelog = %{version}-%{release} Requires: %{name}-plugin-memcachec = %{version}-%{release} -%if 0%{?suse_version} > 1500 +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400 Requires: %{name}-plugin-modbus = %{version}-%{release} %endif %if 0%{?is_opensuse} @@ -790,7 +790,7 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} /srv/www/collectd-js %{_libexecdir}/collectd-js -%if 0%{?suse_version} > 1520 +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300 %files plugin-amqp %{_libdir}/collectd/amqp.so %{_libdir}/collectd/amqp.la @@ -853,7 +853,7 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} %{_libdir}/collectd/memcachec.so %{_libdir}/collectd/memcachec.la -%if 0%{?suse_version} > 1500 +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400 %files plugin-modbus %{_libdir}/collectd/modbus.so %{_libdir}/collectd/modbus.la