Fix/add missing dependencies:

- rbd-fuse depends on librados2/librbd1
- ceph-devel depends on specific releases of libs and libcephfs_jni1
- librbd1 depends on librados2
- python-ceph does not depend on libcephfs1

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
(cherry picked from commit 7cf81322391b629b241da90181800ca1f138ce78)

Conflicts:
	ceph.spec.in

diff --git a/ceph.spec.in b/ceph.spec.in
index 9948c0063772267d48ea578d22b89e10523a9c1d..9622a62ba35118ce385c0dd2de30170f763b255f 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -119,6 +119,8 @@ FUSE based client for Ceph distributed network file system
 Summary:       Ceph fuse-based client
 Group:         System Environment/Base
 Requires:      %{name}
+Requires:      librados2 = %{version}-%{release}
+Requires:      librbd1 = %{version}-%{release}
 BuildRequires: fuse-devel
 %description -n rbd-fuse
 FUSE based client to map Ceph rbd images to files
@@ -128,9 +130,10 @@ Summary:   Ceph headers
 Group:         Development/Libraries
 License:       LGPL-2.0
 Requires:      %{name} = %{version}-%{release}
-Requires:      librados2 = %{version}
-Requires:      librbd1 = %{version}
-Requires:      libcephfs1 = %{version}
+Requires:      librados2 = %{version}-%{release}
+Requires:      librbd1 = %{version}-%{release}
+Requires:      libcephfs1 = %{version}-%{release}
+Requires:      libcephfs_jni1 = %{version}-%{release}
 %description devel
 This package contains libraries and headers needed to develop programs
 that use Ceph.
@@ -183,6 +186,7 @@ store using a simple file-like interface.
 Summary:       RADOS block device client library
 Group:         System Environment/Libraries
 License:       LGPL-2.0
+Requires:      librados2 = %{version}-%{release}
 %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora}
 Obsoletes:     ceph-libs
 %endif
@@ -211,7 +215,6 @@ Group:              System Environment/Libraries
 License:       LGPL-2.0
 Requires:      librados2 = %{version}-%{release}
 Requires:      librbd1 = %{version}-%{release}
-Requires:      libcephfs1 = %{version}-%{release}
 Requires:      python-flask
 %if 0%{defined suse_version}
 %py_requires