From: Sébastien Han <seb@redhat.com>
Date: Wed, 12 Dec 2018 10:28:04 +0000 (+0100)
Subject: spec: requires ceph base instead of common
X-Git-Tag: v12.2.12~54^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5fba50a60695a4411a584dd6c5551c85fa32d029;p=ceph.git

spec: requires ceph base instead of common

Currently rbd-mirror and radosgw packages installation won't create the
Ceph directories in /var/lib/ceph since they depend on ceph-common
only. ceph-base is responsible for creating these directories.

Since ceph-base requires ceph-common then let's use ceph-base as a
dependency.

Fixes: http://tracker.ceph.com/issues/37620
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit c0f77bd69ed0f0d813b1e9c2dd7375828fd42503)

Conflicts:
	ceph.spec.in : Resolved for ceph-base
---

diff --git a/ceph.spec.in b/ceph.spec.in
index d708aea337a..11dc1e4117a 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -382,7 +382,7 @@ Summary:	Ceph daemon for mirroring RBD images
 %if 0%{?suse_version}
 Group:		System/Filesystems
 %endif
-Requires:	ceph-common = %{_epoch_prefix}%{version}-%{release}
+Requires:	ceph-base = %{_epoch_prefix}%{version}-%{release}
 Requires:	librados2 = %{_epoch_prefix}%{version}-%{release}
 %description -n rbd-mirror
 Daemon for mirroring RBD images between Ceph clusters, streaming
@@ -403,7 +403,7 @@ Summary:	Rados REST gateway
 %if 0%{?suse_version}
 Group:		System/Filesystems
 %endif
-Requires:	ceph-common = %{_epoch_prefix}%{version}-%{release}
+Requires:	ceph-base = %{_epoch_prefix}%{version}-%{release}
 %if 0%{with selinux}
 Requires:	ceph-selinux = %{_epoch_prefix}%{version}-%{release}
 %endif