Merge remote-tracking branch 'origin/pr/835'

diff --cc contrib/redhat/collectd.spec
index 6507d5fe0aeb200ae4536025e5ed719f12c9d21a,6f8f34011806b66675f4a5072edaef9e87bc745f..acc38ac4352209efb36db8ce5d7cbaffc036114c
--- 1/contrib/redhat/collectd.spec
--- 2/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -213,9 -213,15 +213,15 @@@ Source:          http://collectd.org/files/%{na
  License:      GPLv2
  Group:                System Environment/Daemons
  BuildRoot:    %{_tmppath}/%{name}-%{version}-root
 -BuildRequires:        libgcrypt-devel, kernel-headers
 +BuildRequires:        libgcrypt-devel, kernel-headers, libtool-ltdl-devel
  Vendor:               collectd development team <collectd@verplant.org>
  
+ %if 0%{?el7:1}
+ Requires(pre):                initscripts
+ Requires(post):               systemd
+ Requires(preun):      systemd
+ Requires(postun):     systemd
+ %else
  Requires(post):               chkconfig
  Requires(preun):      chkconfig, initscripts
  Requires(postun):     initscripts