From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sun, 5 Mar 2017 17:30:23 +0000 (+0100)
Subject: collectd.spec: Don't enable XFS support on RHEL6
X-Git-Tag: collectd-5.7.2~10^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=294aa61f5e961b9a9bec1e27e810a10142017db8;p=collectd.git

collectd.spec: Don't enable XFS support on RHEL6

It is missing for i386.
If there's strong interest in having support for xfs in the df plugin in
RHEL6 we can do some macro magic to only BuildRequire xfsprogs-devel if
were not on rhel6 i386, but this was the easiest fix and unblocks our
package builds.
---

diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec
index 4d8041fc..5181293b 100644
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@ -230,16 +230,17 @@
 Summary:	Statistics collection and monitoring daemon
 Name:		collectd
 Version:	5.6.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 URL:		https://collectd.org
 Source:		https://collectd.org/files/%{name}-%{version}.tar.bz2
 License:	GPLv2
 Group:		System Environment/Daemons
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	libgcrypt-devel, kernel-headers, libtool-ltdl-devel, libcap-devel, which, xfsprogs-devel
+BuildRequires:	libgcrypt-devel, kernel-headers, libtool-ltdl-devel, libcap-devel, which
 Vendor:		collectd development team <collectd@verplant.org>
 
 %if 0%{?fedora} || 0%{?rhel} >= 7
+BuildRequires:		xfsprogs-devel
 %{?systemd_requires}
 BuildRequires:		systemd
 %else
@@ -2515,6 +2516,9 @@ fi
 %doc contrib/
 
 %changelog
+* Sun Mar 05 2017 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.6.1-4
+- Don't enable XFS support on RHEL6, it is missing for i386
+
 * Wed Feb 22 2017 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.6.1-3
 - Enable XFS support in df plugin