]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rpm: adjust ceph-{osdomap,kvstore,monstore}-tool feature move 19839/head
authorKefu Chai <kchai@redhat.com>
Thu, 4 Jan 2018 08:08:25 +0000 (16:08 +0800)
committerKefu Chai <kchai@redhat.com>
Mon, 8 Jan 2018 11:08:47 +0000 (19:08 +0800)
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)

ceph.spec.in

index 1b1a23b1fd19c442ea50e67e0ddc0470a33a98bd..c1656a171bc8f9745a2f79e7d8473ba32f963860 100644 (file)
@@ -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