From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 18 Mar 2016 22:46:27 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~379
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=b66d5b90a0e59e943a61acb4b68ce55e88f08ade;p=collectd.git

Merge branch 'collectd-5.5'
---

b66d5b90a0e59e943a61acb4b68ce55e88f08ade
diff --cc contrib/redhat/collectd.spec
index 53ceb934,fb0a55cd..8d8cb8d9
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -67,7 -66,8 +66,9 @@@
  %{?el7:%global _has_atasmart 1}
  %{?el7:%global _has_hiredis 1}
  %{?el7:%global _has_asm_msr_index 1}
 +%{?el7:%global _has_libmosquitto 1}
+ %{?el7:%global _has_libmodbus 1}
+ %{?el7:%global _has_xmms 1}
  
  # plugins enabled by default
  %define with_aggregation 0%{!?_without_aggregation:1}
@@@ -214,10 -213,6 +216,8 @@@
  %define with_write_kafka 0%{!?_without_write_kafka:0}
  # plugin write_mongodb disabled, requires libmongoc
  %define with_write_mongodb 0%{!?_without_write_mongodb:0}
- # plugin xmms disabled, requires xmms
- %define with_xmms 0%{!?_without_xmms:0}
 +# plugin zone disabled, requires Solaris
 +%define with_zone 0%{!?_without_zone:0}
  
  Summary:	statistics collection and monitoring daemon
  Name:		collectd