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>
(cherry picked from commit e267128ce22d8b8cd83f6d6d82f24f496600e678)

Conflicts:
	ceph.spec.in
            Dropped Requires: xmlstarlet in ceph-test that had inadvertently
            been grabbed from d2cc2b1

diff --git a/ceph.spec.in b/ceph.spec.in
index 343bd2774bf77fa36a2cc36ff80f614d65a5f583..15c531439c861b4a6929350673385376fca545ed 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -53,6 +53,7 @@ BuildRequires:  bzip2-devel
 BuildRequires: cryptsetup
 BuildRequires: gdbm
 BuildRequires: hdparm
+BuildRequires: leveldb-devel > 1.2
 BuildRequires: libaio-devel
 BuildRequires: libcurl-devel
 BuildRequires: libedit-devel
@@ -61,10 +62,9 @@ BuildRequires:       libuuid-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
@@ -110,6 +110,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
@@ -328,11 +337,6 @@ Summary:   Ceph benchmarks and test tools
 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.