packaging: move rbd-replay* to ceph-common

The rbd-replay* utilities are useful for Ceph users with RBD clients.
Currently the rbd-replay* utilities ship in the "ceph-test" package, and
we intend this ceph-test package for Ceph developers and contributors,
not normal users.

Move the rbd-replay* utilities to "ceph-common".

http://tracker.ceph.com/issues/12994 Fixes: #12994

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 96486fd6f284ca3ab67f4f94631896d41c529e85)

Conflicts:
	ceph.spec.in
            50a33dea has not been backported to hammer
	debian/ceph-test.install
            50a33dea has not been backported to hammer
	debian/control
            different ceph-test Replaces: and Breaks: version

diff --git a/ceph.spec.in b/ceph.spec.in
index 8d12e05d3452314bece231fe7c1919b79ca219fb..343bd2774bf77fa36a2cc36ff80f614d65a5f583 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -666,6 +666,11 @@ fi
 %{_bindir}/ceph-crush-location
 %{_bindir}/rados
 %{_bindir}/rbd
+%{_bindir}/rbd-replay
+%{_bindir}/rbd-replay-many
+%if 0%{?fedora} || 0%{?rhel} == 6
+%{_bindir}/rbd-replay-prep
+%endif
 %{_bindir}/ceph-post-file
 %{_bindir}/ceph-brag
 %{_mandir}/man8/ceph-authtool.8*
@@ -677,6 +682,9 @@ fi
 %{_mandir}/man8/ceph.8*
 %{_mandir}/man8/rados.8*
 %{_mandir}/man8/rbd.8*
+%{_mandir}/man8/rbd-replay.8*
+%{_mandir}/man8/rbd-replay-many.8*
+%{_mandir}/man8/rbd-replay-prep.8*
 %{_datadir}/ceph/known_hosts_drop.ceph.com
 %{_datadir}/ceph/id_dsa_drop.ceph.com
 %{_datadir}/ceph/id_dsa_drop.ceph.com.pub
@@ -893,14 +901,6 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %{_bindir}/ceph-monstore-tool
 %{_bindir}/ceph-osdomap-tool
 %{_bindir}/ceph-kvstore-tool
-%{_mandir}/man8/rbd-replay.8*
-%{_mandir}/man8/rbd-replay-many.8*
-%{_mandir}/man8/rbd-replay-prep.8*
-%{_bindir}/rbd-replay
-%{_bindir}/rbd-replay-many
-%if (0%{?fedora} || 0%{?rhel} == 6)
-%{_bindir}/rbd-replay-prep
-%endif
 
 #################################################################################
 %if 0%{with cephfs_java}

diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index 4e21adff9c47439dd7b177892b4603f0b1e8489b..25bb8e2e571bd3c29d4cbe1e94057f922151227e 100644 (file)
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -9,6 +9,7 @@ usr/bin/ceph-syn
 usr/bin/ceph-crush-location
 usr/bin/rados
 usr/bin/rbd
+usr/bin/rbd-replay*
 usr/bin/ceph-post-file
 usr/bin/ceph-brag
 usr/share/man/man8/ceph-authtool.8
@@ -20,6 +21,7 @@ usr/share/man/man8/ceph-post-file.8
 usr/share/man/man8/ceph.8
 usr/share/man/man8/rados.8
 usr/share/man/man8/rbd.8
+usr/share/man/man8/rbd-replay*.8
 usr/share/ceph/known_hosts_drop.ceph.com
 usr/share/ceph/id_dsa_drop.ceph.com
 usr/share/ceph/id_dsa_drop.ceph.com.pub

diff --git a/debian/ceph-test.install b/debian/ceph-test.install
index 1af1a4f1ceadea8611fa17306ee77607cab27d88..b35881a3d0fecb042a1add4a1fb79827de30b16d 100644 (file)
--- a/debian/ceph-test.install
+++ b/debian/ceph-test.install
@@ -24,5 +24,3 @@ usr/bin/ceph-monstore-tool
 usr/bin/ceph-osdomap-tool
 usr/bin/ceph-kvstore-tool
 usr/share/java/libcephfs-test.jar
-usr/bin/rbd-replay*
-usr/share/man/man8/rbd-replay*.8

diff --git a/debian/control b/debian/control
index 40c0f8e5ae58f7e0eff7d04e942c8855a65b2fb0..010a302acee9313ae5ef72f3321302455548432f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -193,9 +193,11 @@ Depends: librbd1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
 Conflicts: ceph-client-tools
 Replaces: ceph-client-tools,
          ceph (<< 0.94.2-2),
+         ceph-test (<< 0.94.5-2),
          python-ceph (<< 0.92-1223),
          librbd1 (<< 0.92-1238)
 Breaks: ceph (<< 0.94.2-2),
+       ceph-test (<< 0.94.5-2),
        python-ceph (<< 0.92-1223),
        librbd1 (<< 0.92-1238)
 Suggests: ceph, ceph-mds