Code

Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Sat, 19 Mar 2016 15:44:05 +0000 (16:44 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Sat, 19 Mar 2016 15:44:05 +0000 (16:44 +0100)
1  2 
contrib/redhat/collectd.spec

index fb0a55cd4da9fe871ada0132f0d518dc154d910f,7f56007fbd40eb10a348e3575436b4c3e0ca2271..1a8eb0e3594dacefbd045fa2798b96270edc6766
  %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_xmms 0%{!?_without_xmms:0%{!?_has_xmms: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}}
 +%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: