From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 8 Sep 2014 15:21:38 +0000 (+0200)
Subject: Merge branch 'collectd-5.3' into collectd-5.4
X-Git-Tag: collectd-5.4.2~15
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=9f2145dc771af94c7a7c49c20210d6870c7955e7

Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
	contrib/redhat/collectd.spec
---

9f2145dc771af94c7a7c49c20210d6870c7955e7
diff --cc contrib/redhat/collectd.spec
index 08502775,d561dc37..7decec5c
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -43,8 -43,18 +43,19 @@@
  %{?el6:%global _has_recent_libganglia 1}
  %{?el6:%global _has_working_libiptc 1}
  %{?el6:%global _has_ip_vs_h 1}
 +%{?el6:%global _has_lvm2app_h 1}
  %{?el6:%global _has_libmodbus 1}
+ %{?el6:%global _has_iproute 1}
+ 
+ %{?el7:%global _has_libyajl 1}
+ %{?el7:%global _has_recent_libpcap 1}
+ %{?el7:%global _has_recent_sockios_h 1}
+ %{?el7:%global _has_working_libiptc 1}
+ %{?el7:%global _has_ip_vs_h 1}
+ %{?el7:%global _has_recent_librrd 1}
+ %{?el7:%global _has_varnish4 1}
+ %{?el7:%global _has_broken_libmemcached 1}
+ %{?el7:%global _has_iproute 1}
  
  # plugins enabled by default
  %define with_aggregation 0%{!?_without_aggregation:1}
@@@ -163,10 -167,6 +175,8 @@@
  %define with_redis 0%{!?_without_redis:0}
  # plugin routeros disabled, requires librouteros
  %define with_routeros 0%{!?_without_routeros:0}
- # plugin rrdcached disabled, requires rrdtool >= 1.4
- %define with_rrdcached 0%{!?_without_rrdcached:0}
 +# plugin sigrok disabled, requires libsigrok
 +%define with_sigrok 0%{!?_without_sigrok:0}
  # plugin tape disabled, requires libkstat
  %define with_tape 0%{!?_without_tape:0}
  # plugin tokyotyrant disabled, requires tcrdb.h
@@@ -447,10 -417,9 +457,9 @@@ handlers and database traffic
  Summary:	netlink plugin for collectd
  Group:		System Environment/Daemons
  Requires:	%{name}%{?_isa} = %{version}-%{release}
- BuildRequires:	libmnl-devel
 -BuildRequires:	iproute-devel
++BuildRequires:	libmnl-devel, iproute-devel
  %description netlink
- This plugin collects very detailed Linux network interface and routing
- statistics.
+ The netlink plugin collects detailed network interface and routing statistics.
  %endif
  
  %if %{with_nginx}
@@@ -1896,11 -1790,11 +1899,16 @@@ f
  %{_libdir}/%{name}/memcachec.so
  %endif
  
 +%if %{with_mic}
 +%files mic
 +%{_libdir}/%{name}/mic.so
 +%endif
 +
+ %if %{with_modbus}
+ %files modbus
+ %{_libdir}/%{name}/modbus.so
+ %endif
+ 
  %if %{with_mysql}
  %files mysql
  %{_libdir}/%{name}/mysql.so