Merge branch 'collectd-5.4' into collectd-5.5

diff --cc contrib/redhat/collectd.spec
index 73da03d,ecdf5ea..fb0a55c
--- 1/contrib/redhat/collectd.spec
--- 2/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -60,13 -56,11 +60,14 @@@
  %{?el7:%global _has_working_libiptc 1}
  %{?el7:%global _has_ip_vs_h 1}
  %{?el7:%global _has_lvm2app_h 1}
 +%{?el7:%global _has_libudev 1}
  %{?el7:%global _has_recent_librrd 1}
- %{?el7:%global _has_broken_libmemcached 1}
 -%{?el7:%global _has_varnish4 1}
  %{?el7:%global _has_iproute 1}
 +%{?el7:%global _has_atasmart 1}
 +%{?el7:%global _has_hiredis 1}
 +%{?el7:%global _has_asm_msr_index 1}
+ %{?el7:%global _has_libmodbus 1}
+ %{?el7:%global _has_xmms 1}
  
  # plugins enabled by default
  %define with_aggregation 0%{!?_without_aggregation:1}
@@@ -170,13 -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_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:
@@@ -207,12 -187,12 +209,10 @@@
  %define with_tape 0%{!?_without_tape:0}
  # plugin tokyotyrant disabled, requires tcrdb.h
  %define with_tokyotyrant 0%{!?_without_tokyotyrant:0}
 +# plugin write_kafka disabled, requires librdkafka
 +%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 write_redis disabled, requires credis
 -%define with_write_redis 0%{!?_without_write_redis:0}
 -# plugin zfs_arc disabled, requires FreeBSD/Solaris
 -%define with_zfs_arc 0%{!?_without_zfs_arc:0}
  
  Summary:      statistics collection and monitoring daemon
  Name:         collectd
@@@ -2334,19 -2053,7 +2349,19 @@@ f
  %doc contrib/
  
  %changelog
- * Mon Aug 19 2013 Marc Fournier <marc.fournier@camptocamp.com> 5.4.0-1
 +* Wed May 27 2015 Marc Fournier <marc.fournier@camptocamp.com> 5.5.0-1
 +- New upstream version
 +- New plugins enabled by default: ceph, drbd, log_logstash, write_tsdb, smart,
 +  openldap, redis, write_redis, zookeeper, write_log, write_sensu, ipc,
 +  turbostat, fhcount
 +- New plugins disabled by default: barometer, write_kafka
 +- Enable zfs_arc, now supported on Linux
 +- Install disk plugin in a dedicated package, as it depends on libudev
 +- use systemd on EL7, sysvinit on EL6 & EL5
 +- Install collectdctl, collectd-tg and collectd-nagios in collectd-utils.rpm
 +- Add build-dependency on libcap-devel
 +
+ * Mon Aug 19 2013 Marc Fournier <marc.fournier@camptocamp.com> 5.4.2-1
  - New upstream version
  - Build netlink plugin by default
  - Enable cgroups, lvm and statsd plugins