Merge pull request ceph#5193 from SUSE/wip-babeltrace-suse

ceph.spec.in: fix lttng/babeltrace conditionals Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
weiqian · Sep 4, 2015 · ed4cf3d · ed4cf3d
2 parents b08da2c + e267128
commit ed4cf3d
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/ceph.spec.in b/ceph.spec.in
@@ -99,17 +99,17 @@ BuildRequires:  cmake
 BuildRequires:	cryptsetup
 BuildRequires:	gdbm
 BuildRequires:	hdparm
+BuildRequires:	leveldb-devel > 1.2
 BuildRequires:	libaio-devel
 BuildRequires:	libcurl-devel
 BuildRequires:	libedit-devel
 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
@@ -161,6 +161,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
@@ -373,10 +382,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.
 
@@ -1095,7 +1100,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