From d7b493a7108a68302bc0f48337bf3c253a720266 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Fri, 13 Oct 2017 10:34:52 +0200 Subject: [PATCH] build/ops: rpm: move ceph-*-tool binaries out of ceph-test subpackage ceph-osdomap-tool into ceph-osd subpackage ceph-monstore-tool into ceph-mon subpackage ceph-kvstore-tool into the ceph-base subpackage Fixes: http://tracker.ceph.com/issues/21762 Signed-off-by: Nathan Cutler --- ceph.spec.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 1c146d18d7e..25a6c6f652f 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -932,6 +932,7 @@ rm -rf %{buildroot} %{_bindir}/crushtool %{_bindir}/monmaptool %{_bindir}/osdmaptool +%{_bindir}/ceph-kvstore-tool %{_bindir}/ceph-run %{_bindir}/ceph-detect-init %{_libexecdir}/systemd/system-preset/50-ceph.preset @@ -984,6 +985,7 @@ rm -rf %{buildroot} %{_mandir}/man8/crushtool.8* %{_mandir}/man8/osdmaptool.8* %{_mandir}/man8/monmaptool.8* +%{_mandir}/man8/ceph-kvstore-tool.8* #set up placeholder directories %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/tmp %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-osd @@ -1239,6 +1241,7 @@ fi %files mon %{_bindir}/ceph-mon %{_bindir}/ceph-rest-api +%{_bindir}/ceph-monstore-tool %{_mandir}/man8/ceph-mon.8* %{_mandir}/man8/ceph-rest-api.8* %{python_sitelib}/ceph_rest_api.py* @@ -1407,6 +1410,7 @@ fi %{_bindir}/ceph-clsinfo %{_bindir}/ceph-bluestore-tool %{_bindir}/ceph-objectstore-tool +%{_bindir}/ceph-osdomap-tool %{_bindir}/ceph-osd %{_libexecdir}/ceph/ceph-osd-prestart.sh %dir %{_udevrulesdir} @@ -1632,12 +1636,8 @@ fi %{_bindir}/ceph_tpbench %{_bindir}/ceph_xattr_bench %{_bindir}/ceph-coverage -%{_bindir}/ceph-monstore-tool -%{_bindir}/ceph-osdomap-tool -%{_bindir}/ceph-kvstore-tool %{_bindir}/ceph-debugpack %{_mandir}/man8/ceph-debugpack.8* -%{_mandir}/man8/ceph-kvstore-tool.8* %dir %{_libdir}/ceph %{_libdir}/ceph/ceph-monstore-update-crush.sh %endif -- 2.47.3