From: Nathan Cutler <ncutler@suse.com>
Date: Wed, 15 Jul 2015 10:54:20 +0000 (+0200)
Subject: ceph.spec.in: fix lttng/babeltrace conditionals
X-Git-Tag: v9.1.0~213^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5193%2Fhead;p=ceph.git

ceph.spec.in: fix lttng/babeltrace conditionals

lttng and babeltrace are build dependencies for rbd-replay-prep. Make
sure the right package names are used. Enable for SLE12, as well as
for openSUSE 13.1 and higher.

Move the BuildRequires out of the ceph-test subpackage and into the
distro-conditional dependencies section.

Make ordering of BuildRequires a little more alphabetical.

http://tracker.ceph.com/issues/12360 Fixes: #12360

Signed-off-by: Nathan Cutler <ncutler@suse.com>

sqme
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 8e63d6e4e6af5..4b5a3ccc6e586 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -97,6 +97,7 @@ BuildRequires:  cmake
 BuildRequires:	cryptsetup
 BuildRequires:	gdbm
 BuildRequires:	hdparm
+BuildRequires:	leveldb-devel > 1.2
 BuildRequires:	libaio-devel
 BuildRequires:	libcurl-devel
 BuildRequires:	libedit-devel
@@ -104,10 +105,9 @@ BuildRequires:	libxml2-devel
 BuildRequires:	libblkid-devel >= 2.17
 BuildRequires:	libudev-devel
 BuildRequires:	libtool
-BuildRequires:	leveldb-devel > 1.2
 BuildRequires:	make
-BuildRequires:	perl
 BuildRequires:	parted
+BuildRequires:	perl
 BuildRequires:	pkgconfig
 BuildRequires:	python
 BuildRequires:	python-nose
@@ -159,6 +159,15 @@ Requires(preun):	initscripts
 BuildRequires:	gperftools-devel
 Requires:	python-flask
 %endif
+# lttng and babeltrace for rbd-replay-prep
+%if 0%{?fedora} || 0%{?rhel} == 6
+BuildRequires:	lttng-ust-devel
+BuildRequires:	libbabeltrace-devel
+%endif
+%if 0%{?suse_version} >= 1310
+BuildRequires:	lttng-ust-devel
+BuildRequires:  babeltrace-devel
+%endif
 
 %description
 Ceph is a massively scalable, open-source, distributed
@@ -371,10 +380,6 @@ Group:		System Environment/Libraries
 License:	LGPL-2.0
 Requires:	ceph-common
 Requires:	xmlstarlet
-%if (0%{?fedora} || 0%{?rhel} == 6)
-BuildRequires:	lttng-ust-devel
-BuildRequires:	libbabeltrace-devel
-%endif
 %description -n ceph-test
 This package contains Ceph benchmarks and test tools.
 
@@ -1093,7 +1098,7 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %{_mandir}/man8/rbd-replay-prep.8*
 %{_bindir}/rbd-replay
 %{_bindir}/rbd-replay-many
-%if (0%{?fedora} || 0%{?rhel} == 6)
+%if 0%{?fedora} || 0%{?rhel} == 6 || 0%{?suse_version} >= 1310
 %{_bindir}/rbd-replay-prep
 %endif
 %dir %{_libdir}/ceph