From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 8 Feb 2016 08:46:21 +0000 (+0100)
Subject: RPM specfile: re-enable varnish plugin on EL7
X-Git-Tag: collectd-5.5.2~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1544%2Fhead;p=thirdparty%2Fcollectd.git

RPM specfile: re-enable varnish plugin on EL7

... as the collectd-5.5 line now supports the varnish 4 API.
---

diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec
index 9d491ff81..7407dc8d1 100644
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@ -62,7 +62,6 @@
 %{?el7:%global _has_lvm2app_h 1}
 %{?el7:%global _has_libudev 1}
 %{?el7:%global _has_recent_librrd 1}
-%{?el7:%global _has_varnish4 1}
 %{?el7:%global _has_broken_libmemcached 1}
 %{?el7:%global _has_iproute 1}
 %{?el7:%global _has_atasmart 1}
@@ -165,7 +164,7 @@
 %define with_uptime 0%{!?_without_uptime:1}
 %define with_users 0%{!?_without_users:1}
 %define with_uuid 0%{!?_without_uuid:1}
-%define with_varnish 0%{!?_without_varnish:0%{!?_has_varnish4:1}}
+%define with_varnish 0%{!?_without_varnish:1}
 %define with_vmem 0%{!?_without_vmem:1}
 %define with_vserver 0%{!?_without_vserver:1}
 %define with_wireless 0%{!?_without_wireless:1}