From: Kefu Chai <kchai@redhat.com>
Date: Thu, 4 Jan 2018 08:08:25 +0000 (+0800)
Subject: rpm: adjust ceph-{osdomap,kvstore,monstore}-tool feature move
X-Git-Tag: v12.2.3~120^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0a347506af4b45decf604bea4144ac1eafc2d34e;p=ceph.git

rpm: adjust ceph-{osdomap,kvstore,monstore}-tool feature move

this is the rpm's counterpart of debian/control changes related to the
ceph-{osdomap,kvstore,monstore}-tool feature move. see #19328 and #19356.
the commit introducing this move is 6dba25e. and

$ git describe 6dba25e
v12.2.2-8-g6dba25e39d

so the first release that have this change is 12.2.2-8. in other words,
ceph-{base,osd,mon} >= 12.2.2.8 cannot co-exist with ceph-test < 12.2.2-8
in the same system. so we let ceph-test Requires ceph-common with the
same version. and since ceph-{osd,mon} Requires ceph-base with the same
version, and ceph-base Requires ceph-common with the same version, so by
tiering ceph-test with ceph-common with the same version, we enforce
this restriction.

Fixes: http://tracker.ceph.com/issues/22558
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit b07aa210aa0ede54ffc3dbe49e334bd51a8f6342)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 1b1a23b1fd19..c1656a171bc8 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -678,7 +678,7 @@ Summary:	Ceph benchmarks and test tools
 %if 0%{?suse_version}
 Group:		System/Benchmark
 %endif
-Requires:	ceph-common
+Requires:	ceph-common = %{_epoch_prefix}%{version}-%{release}
 Requires:	xmlstarlet
 Requires:	jq
 Requires:	socat