RPM: align runtime dependencies with Debian packaging

The ceph package is now a metapackage, so move all its runtime dependencies
to ceph-base as we already have done in the Debian packaging.

Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 020139f730f3d31aa5d71b7a09db6dc57bb6d91a..9b11482f754c28bab24d44aca99e0a5ae591f11e 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -93,27 +93,6 @@ Patch0:              init-ceph.in-fedora.patch
 Requires:       ceph-osd = %{epoch}:%{version}-%{release}
 Requires:       ceph-mds = %{epoch}:%{version}-%{release}
 Requires:       ceph-mon = %{epoch}:%{version}-%{release}
-Requires:      librbd1 = %{epoch}:%{version}-%{release}
-Requires:      librados2 = %{epoch}:%{version}-%{release}
-Requires:      libcephfs1 = %{epoch}:%{version}-%{release}
-Requires:      ceph-common = %{epoch}:%{version}-%{release}
-%if 0%{with selinux}
-Requires:      ceph-selinux = %{epoch}:%{version}-%{release}
-%endif
-Requires:      python-rados = %{epoch}:%{version}-%{release}
-Requires:      python-rbd = %{epoch}:%{version}-%{release}
-Requires:      python-cephfs = %{epoch}:%{version}-%{release}
-Requires:      python
-Requires:      python-requests
-Requires:      grep
-Requires:      xfsprogs
-Requires:      logrotate
-Requires:      parted
-Requires:      util-linux
-Requires:      hdparm
-Requires:      cryptsetup
-Requires:      findutils
-Requires:      which
 Requires(post):        binutils
 %if 0%{with cephfs_java}
 BuildRequires: java-devel
@@ -248,6 +227,23 @@ on commodity hardware and delivers object, block and file system storage.
 Summary:       Ceph Base Package
 Group:         System Environment/Base
 Requires:      ceph-common = %{epoch}:%{version}-%{release}
+Requires:      librbd1 = %{epoch}:%{version}-%{release}
+Requires:      librados2 = %{epoch}:%{version}-%{release}
+Requires:      libcephfs1 = %{epoch}:%{version}-%{release}
+%if 0%{with selinux}
+Requires:      ceph-selinux = %{epoch}:%{version}-%{release}
+%endif
+Requires:      python
+Requires:      python-requests
+Requires:      grep
+Requires:      xfsprogs
+Requires:      logrotate
+Requires:      parted
+Requires:      util-linux
+Requires:      hdparm
+Requires:      cryptsetup
+Requires:      findutils
+Requires:      which
 %description base
 Base is the package that includes all the files shared amongst ceph servers