From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Sat, 19 Mar 2016 15:44:05 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~32
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=d9db39b8e8b5e9a34d955d057574f6ddd00759e6

Merge branch 'collectd-5.4' into collectd-5.5
---

d9db39b8e8b5e9a34d955d057574f6ddd00759e6
diff --cc contrib/redhat/collectd.spec
index fb0a55cd,7f56007f..1a8eb0e3
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -171,14 -155,8 +171,14 @@@
  %define with_wireless 0%{!?_without_wireless:1}
  %define with_write_graphite 0%{!?_without_write_graphite:1}
  %define with_write_http 0%{!?_without_write_http:1}
 +%define with_write_log 0%{!?_without_write_log:1}
 +%define with_write_redis 0%{!?_without_write_redis:0%{?_has_hiredis}}
  %define with_write_riemann 0%{!?_without_write_riemann:1}
 +%define with_write_sensu 0%{!?_without_write_sensu:1}
 +%define with_write_tsdb 0%{!?_without_write_tsdb:1}
- %define with_xmms 0%{!?_without_xmms:0%{!?_has_xmms:1}}
+ %define with_xmms 0%{!?_without_xmms:0%{?_has_xmms}}
 +%define with_zfs_arc 0%{!?_without_zfs_arc:1}
 +%define with_zookeeper 0%{!?_without_zookeeper:1}
  
  # Plugins not built by default because of dependencies on libraries not
  # available in RHEL or EPEL: