From: Nathan Cutler <ncutler@suse.com>
Date: Fri, 26 Feb 2016 20:51:26 +0000 (+0100)
Subject: RPM: align runtime dependencies with Debian packaging
X-Git-Tag: v10.0.4~5^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=608dd287132946575f143c9c3199e9d2d43c2504;p=ceph.git

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 020139f730f..9b11482f754 100644
--- 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