From 341d98567386b40584ad6c9b78f4c837d76c1907 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 12 Feb 2018 17:05:35 +0100 Subject: [PATCH] build/ops: rpm: provide files moved from ceph-test d7b493a7108a68302bc0f48337bf3c253a720266 moved three binaries from the ceph-test package to other packages, causing trouble with upgrades in test lab environments (users typically do not install the ceph-test package). While the original upgrade troubles have already been addressed, RPM has a "Provides" mechanism for easing the pain, so it makes sense to use it. Fixes: http://tracker.ceph.com/issues/22558 Signed-off-by: Nathan Cutler --- ceph.spec.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ceph.spec.in b/ceph.spec.in index fb3bc47980950..4850e8f283f00 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -305,6 +305,7 @@ Summary: Ceph Base Package %if 0%{?suse_version} Group: System/Filesystems %endif +Provides: ceph-test:/usr/bin/ceph-kvstore-tool Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} Requires: librados2 = %{_epoch_prefix}%{version}-%{release} @@ -379,6 +380,7 @@ Summary: Ceph Monitor Daemon %if 0%{?suse_version} Group: System/Filesystems %endif +Provides: ceph-test:/usr/bin/ceph-monstore-tool Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} %description mon ceph-mon is the cluster monitor daemon for the Ceph distributed file @@ -501,6 +503,7 @@ Summary: Ceph Object Storage Daemon %if 0%{?suse_version} Group: System/Filesystems %endif +Provides: ceph-test:/usr/bin/ceph-osdomap-tool Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} Requires: lvm2 Requires: sudo -- 2.39.5