From 253385d4cc025816f20cd2b70d5591925681adbe Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 25 Mar 2019 13:51:41 +0800 Subject: [PATCH] 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 --- ceph.spec.in | 2 +- debian/control | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index da17c6cf81e..6bf42243039 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 89c24dd4391..bfb22d83e8d 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