Accepting request 353681 from home:aeneas_jaissle:branches:server:monitoring

Add %bcond for modbus

OBS-URL: https://build.opensuse.org/request/show/353681
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=130

collectd.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 14 10:53:13 UTC 2016 - aj@ajaissle.de
+
+- Added %bcond for modbus
+
 -------------------------------------------------------------------
 Thu Dec 17 17:56:16 CET 2015 - ro@suse.de
 

collectd.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package collectd
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2005-2013 Pascal Bleser <pascal.bleser@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -17,6 +17,8 @@
 #
 
 
+%bcond_with modbus
+
 %define madwifi_plugin madwifi
 %define pcap_version %({rpm -q --qf='%{VERSION}\n' libpcap-devel 2>/dev/null || echo 0.0.0} | gawk -F. '{print $1*10000+$2*100+$3}')
 %define snmp       1
@@ -57,11 +59,6 @@
 %define memcachec 0
 %define memcached_plugin %{nil}
 %endif
-%if ! 0%{?_without_modbus:1}
-%define modbus 1
-%else
-%define modbus 0
-%endif
 %if 0%{?suse_version} < 1000
 %define libnotify 0
 %else
@@ -170,7 +167,6 @@ BuildRequires:  intltool
 BuildRequires:  kernel-source
 BuildRequires:  libart_lgpl-devel
 BuildRequires:  libevent-devel
-#BuildRequires:  libmodbus-devel
 BuildRequires:  libmnl-devel
 BuildRequires:  libnetlink-devel
 BuildRequires:  liboping-devel
@@ -268,7 +264,7 @@ BuildRequires:  libdbi-devel
 %if %{memcachec}
 BuildRequires:  libmemcached-devel
 %endif
-%if %{modbus}
+%if %{with modbus}
 BuildRequires:  libmodbus-devel
 %endif
 %if %{protobuf}
@@ -444,7 +440,7 @@ Requires:       %{name} = %{version}-%{release}
 Optional %{name} plugin to sample memcached statistics.
 %endif #memcachec
 
-%if %{modbus}
+%if %{with modbus}
 %package plugin-modbus
 Summary:        ModBus Plugin for %{name}
 Group:          System/Monitoring
@@ -499,7 +495,7 @@ Requires:       %{name}-plugin-dbi = %{version}-%{release}
 %if %{memcachec}
 Requires:       %{name}-plugin-memcachec = %{version}-%{release}
 %endif #memcachec
-%if %{modbus}
+%if %{with modbus}
 Requires:       %{name}-plugin-modbus = %{version}-%{release}
 %endif #modbus
 %if %{protobuf}
@@ -640,7 +636,7 @@ export KERNEL_DIR=%{_prefix}/src/linux
 %else
     --disable-memcached \
 %endif #memcachec
-%if %{modbus}
+%if %{with modbus}
     --enable-modbus \
 %else
     --disable-modbus \
@@ -970,7 +966,7 @@ ln -s "../..%{_initddir}/collectd" "%{buildroot}%{_sbindir}/rccollectd"
 %{_libdir}/collectd/memcachec.la
 %endif #memcachec
 
-%if %{modbus}
+%if %{with modbus}
 %files plugin-modbus
 %defattr(-,root,root)
 %{_libdir}/collectd/modbus.so