From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 8 Sep 2014 10:49:49 +0000 (+0200)
Subject: RPM specfile: remove define accidentally re-added when handling merge conflict
X-Git-Tag: collectd-5.4.2~16
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ac3fed091af7e3694623479c49728417210af56e;p=collectd.git

RPM specfile: remove define accidentally re-added when handling merge conflict
---

diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec
index 37fdbc81..08502775 100644
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@ -151,8 +151,6 @@
 %define with_lpar 0%{!?_without_lpar:0}
 # plugin mic disabled, requires Mic
 %define with_mic 0%{!?_without_mic:0}
-# plugin modbus disabled, requires libmodbus
-%define with_modbus 0%{!?_without_modbus:0}
 # plugin netapp disabled, requires libnetapp
 %define with_netapp 0%{!?_without_netapp:0}
 # plugin onewire disabled, requires libowfs