From: Kefu Chai <kchai@redhat.com>
Date: Mon, 25 Mar 2019 05:51:41 +0000 (+0800)
Subject: rpm,deb: let immutable-object-cache depend on librados2
X-Git-Tag: v15.0.0~103^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F27150%2Fhead;p=ceph.git

rpm,deb: let immutable-object-cache depend on librados2

ceph-common depends on librados2, but ceph-immutable-object-cache only
uses librados2's C++ API, so librados2 would suffice.

rpmbuild is able to figure out the .so dependencies, and let
ceph-immutable-object-cache depend on the package which offers
librados2, but we'd better make sure immutable-object-cache is linked
against the librados2 of the same version, to ensure that librados2
offers the correct C++ symbols. as we only version the C++ API in the
librados2 after nautilus.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index da17c6cf81e8f..6bf4224303966 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -585,7 +585,7 @@ Summary:	Ceph daemon for immutable object cache
 %if 0%{?suse_version}
 Group:		System/Filesystems
 %endif
-Requires:	ceph-common = %{_epoch_prefix}%{version}-%{release}
+Requires:	librados2 = %{_epoch_prefix}%{version}-%{release}
 %description immutable-object-cache
 Daemon for immutable object cache.
 
diff --git a/debian/control b/debian/control
index 89c24dd4391c9..bfb22d83e8d18 100644
--- a/debian/control
+++ b/debian/control
@@ -427,8 +427,7 @@ Description: debugging symbols for rbd-fuse
 
 Package: ceph-immutable-object-cache
 Architecture: linux-any
-Depends: ceph-common (= ${binary:Version}),
-         librados2 (= ${binary:Version}),
+Depends: librados2 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Ceph daemon for immutable object cache