From: Jesse Williamson <jwilliamson@suse.de>
Date: Mon, 13 Aug 2018 22:39:58 +0000 (-0700)
Subject: package: modify ceph.spec.in to support libradosstriper conditional compilation
X-Git-Tag: v13.2.2~41^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c5d42df91ba61ad30c135cb22b2f77bf94edf36e;p=ceph.git

package: modify ceph.spec.in to support libradosstriper conditional compilation

Signed-off-by: Jesse Williamson <jwilliamson@suse.de>
(cherry picked from commit 1a44357f5c51b61dc4f6735b4b75715d66baa73c)

Conflicts:
	ceph.spec.in

- no cephfs shell in mimic
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 535163a5ed08..838f5b8b0f73 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -26,6 +26,7 @@
 %bcond_without ceph_test_package
 %bcond_without cephfs_java
 %bcond_without lttng
+%bcond_without libradosstriper
 %global _remote_tarball_prefix https://download.ceph.com/tarballs/
 %endif
 %if 0%{?suse_version}
@@ -38,7 +39,9 @@
 %endif
 %if 0%{?is_opensuse}
 %bcond_without lttng
+%bcond_without libradosstriper
 %else
+%bcond_with libradosstriper
 %ifarch x86_64 aarch64
 %bcond_without lttng
 %else
@@ -328,6 +331,9 @@ Requires:	python%{_python_buildid}-requests
 Requires:	python%{_python_buildid}-PrettyTable
 Requires:	python%{_python_buildid}-requests
 %endif
+%if 0%{with libradosstriper}
+Requires:	libradosstriper1 = %{_epoch_prefix}%{version}-%{release}
+%endif
 %{?systemd_requires}
 %if 0%{?suse_version}
 Requires(pre):	pwdutils
@@ -580,6 +586,7 @@ Requires:	librados2 = %{_epoch_prefix}%{version}-%{release}
 This package contains Python 3 libraries for interacting with Cephs RADOS
 object store.
 
+%if 0%{with libradosstriper}
 %package -n libradosstriper1
 Summary:	RADOS striping interface
 %if 0%{?suse_version}
@@ -604,6 +611,7 @@ Obsoletes:	libradosstriper1-devel < %{_epoch_prefix}%{version}-%{release}
 %description -n libradosstriper-devel
 This package contains libraries and headers needed to develop programs
 that use RADOS striping interface.
+%endif
 
 %package -n librbd1
 Summary:	RADOS block device client library
@@ -934,6 +942,11 @@ cmake .. \
     -DWITH_BOOST_CONTEXT=ON \
 %else
     -DWITH_BOOST_CONTEXT=OFF \
+%endif
+%if 0%{with libradosstriper}
+    -DWITH_LIBRADOSSTRIPER=ON \
+%else
+    -DWITH_LIBRADOSSTRIPER=OFF \
 %endif
     -DBOOST_J=$CEPH_SMP_NCPUS
 
@@ -1620,6 +1633,7 @@ fi
 %{python3_sitearch}/rados.cpython*.so
 %{python3_sitearch}/rados-*.egg-info
 
+%if 0%{with libradosstriper}
 %files -n libradosstriper1
 %{_libdir}/libradosstriper.so.*
 
@@ -1632,6 +1646,7 @@ fi
 %{_includedir}/radosstriper/libradosstriper.h
 %{_includedir}/radosstriper/libradosstriper.hpp
 %{_libdir}/libradosstriper.so
+%endif
 
 %files -n librbd1
 %{_libdir}/librbd.so.*