From 549435f7bd9241352e21de7c722ce8eec5f41b97 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 9 Jul 2024 11:25:24 +0100 Subject: [PATCH] Install virt-v2v-in-place as unsupported tool on RHEL On RHEL we want to ship virt-v2v-in-place, but it is not supported, so move it to libexec and remove the documentation. Fixes: https://issues.redhat.com/browse/RHEL-40903 (cherry picked from commit 37f4f2f35dc14de187f53abc82c0e0054c315243) --- virt-v2v.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 16196ce..3b7b468 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -251,8 +251,10 @@ ln -sf ../../i686-w64-mingw32/sys-root/mingw/bin/pnp_wait.exe popd %if 0%{?rhel} -# On RHEL remove virt-v2v-in-place. -rm $RPM_BUILD_ROOT%{_bindir}/virt-v2v-in-place +# On RHEL move virt-v2v-in-place to libexec since it is not supported, +# and remove the documentation. +mkdir -p $RPM_BUILD_ROOT%{_libexecdir} +mv $RPM_BUILD_ROOT%{_bindir}/virt-v2v-in-place $RPM_BUILD_ROOT%{_libexecdir}/ rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-in-place.1* %endif @@ -305,6 +307,8 @@ make -C tests TESTS=test-v2v-fedora-luks-on-lvm-conversion.sh check %{_bindir}/virt-v2v %if !0%{?rhel} %{_bindir}/virt-v2v-in-place +%else +%{_libexecdir}/virt-v2v-in-place %endif %{_bindir}/virt-v2v-inspector %{_mandir}/man1/virt-v2v.1*