From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Wed, 14 Jan 2015 22:28:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/pr/835'
X-Git-Tag: collectd-5.5.0~96
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=60786de4e8280a109077ab5ecc293f74b3b9bce3;p=collectd.git

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

60786de4e8280a109077ab5ecc293f74b3b9bce3
diff --cc contrib/redhat/collectd.spec
index 6507d5fe,6f8f3401..acc38ac4
--- a/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