]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: fix lttng/babeltrace conditionals
authorNathan Cutler <ncutler@suse.com>
Wed, 15 Jul 2015 10:54:20 +0000 (12:54 +0200)
committerNathan Cutler <ncutler@suse.com>
Tue, 27 Oct 2015 10:24:18 +0000 (11:24 +0100)
lttng and babeltrace are build dependencies for rbd-replay-prep. However, they
are available only in SLE12, not in openSUSE.

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

Make ordering of BuildRequires a little more alphabetical.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 34c72f85410b362314ba130ae6bb7c1df2e70fe6)

Conflicts:
ceph.spec.in

ceph.spec.in

index bb39d934c80c44be5cfb8b81aba3ee749655baef..40065e49a94155d7006cb3ffe478a58781cd0313 100644 (file)
@@ -93,6 +93,7 @@ BuildRequires:        boost-devel
 BuildRequires: cryptsetup
 BuildRequires: gdbm
 BuildRequires: hdparm
+BuildRequires: leveldb-devel > 1.2
 BuildRequires: libaio-devel
 BuildRequires: libcurl-devel
 BuildRequires: libedit-devel
@@ -101,10 +102,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
@@ -151,6 +151,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} == 1315
+BuildRequires: lttng-ust-devel
+BuildRequires:  babeltrace-devel
+%endif
 
 %description
 Ceph is a massively scalable, open-source, distributed
@@ -370,14 +379,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
-%if 0%(?suse_version)
-BuildRequires: lttng-ust-devel
-BuildRequires: babeltrace-devel
-%endif
 %description -n ceph-test
 This package contains Ceph benchmarks and test tools.
 
@@ -1090,7 +1091,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 || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?rhel} == 6 || 0%{?suse_version} == 1315
 %{_bindir}/rbd-replay-prep
 %endif