From: Ken Dreyer <kdreyer@redhat.com>
Date: Wed, 24 Jun 2015 22:37:58 +0000 (-0600)
Subject: ceph.spec.in: rm reference to EOL Fedoras (< 20)
X-Git-Tag: v0.94.6~70^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dfe27c6ba05d49bb73854754b9d5c02cf1c7b1ef;p=ceph.git

ceph.spec.in: rm reference to EOL Fedoras (< 20)

Fedora 19 is EOL, so there's no need to refer to Fedoras less than 20.
"%{fedora}" effectively implies "Fedora 20 and above".

Reported-by: Ira Cooper <ira@samba.org>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit f3e4a91c458ca7b11706fe4608cb739499f5d3cc)

Conflicts:
	ceph.spec.in
           added xmlstarlet dependency to ceph-test package
---

diff --git a/ceph.spec.in b/ceph.spec.in
index a49383d3a50e9..cf2d901f585d0 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -324,7 +324,8 @@ Summary:	Ceph benchmarks and test tools
 Group:		System Environment/Libraries
 License:	LGPL-2.0
 Requires:	ceph-common
-%if (0%{?fedora} >= 20 || 0%{?rhel} == 6)
+Requires:	xmlstarlet
+%if (0%{?fedora} || 0%{?rhel} == 6)
 BuildRequires:	lttng-ust-devel
 BuildRequires:	libbabeltrace-devel
 %endif