Merge branch 'collectd-5.4' into collectd-5.5

diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec
index fb0a55c..1a8eb0e 100644 (file)
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@ -176,7 +176,7 @@
 %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}