From b30f630728e0974ef274ff86c398dac29070538b Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 14 Mar 2022 14:58:55 +0000
Subject: [PATCH] Add virt-v2v-in-place binary

Also don't use absolute symlinks because of this error:

RPM build errors:
    absolute symlink: /usr/share/virt-tools/pnp_wait.exe -> /usr/i686-w64-mingw32/sys-root/mingw/bin/pnp_wait.exe
    absolute symlink: /usr/share/virt-tools/rhsrvany.exe -> /usr/i686-w64-mingw32/sys-root/mingw/bin/rhsrvany.exe
---
 virt-v2v.spec | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/virt-v2v.spec b/virt-v2v.spec
index d90cceb..f11a8f1 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -223,10 +223,16 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 # mingw32-srvany.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/virt-tools
 pushd $RPM_BUILD_ROOT%{_datadir}/virt-tools
-ln -sf /usr/i686-w64-mingw32/sys-root/mingw/bin/rhsrvany.exe
-ln -sf /usr/i686-w64-mingw32/sys-root/mingw/bin/pnp_wait.exe
+ln -sf ../../i686-w64-mingw32/sys-root/mingw/bin/rhsrvany.exe
+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
+rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-in-place.1*
+%endif
+
 # Find locale files.
 %find_lang %{name}
 
@@ -263,11 +269,16 @@ popd
 %license COPYING
 %doc README
 %{_bindir}/virt-v2v
+%if !0%{?rhel}
+%{_bindir}/virt-v2v-in-place
+%endif
 %{_mandir}/man1/virt-v2v.1*
 %{_mandir}/man1/virt-v2v-hacking.1*
 %{_mandir}/man1/virt-v2v-input-vmware.1*
 %{_mandir}/man1/virt-v2v-input-xen.1*
+%if !0%{?rhel}
 %{_mandir}/man1/virt-v2v-in-place.1*
+%endif
 %{_mandir}/man1/virt-v2v-output-local.1*
 %{_mandir}/man1/virt-v2v-output-openstack.1*
 %{_mandir}/man1/virt-v2v-output-rhv.1*
@@ -297,6 +308,7 @@ popd
 - New upstream stable branch version 2.0.0
 - New virt-v2v-in-place and release notes man pages.
 - Remove the RHEL (downstream) patches which are out of date.
+- Don't use absolute symlinks.
 
 * Tue Feb 15 2022 Richard W.M. Jones <rjones@redhat.com> - 1:1.45.99-1
 - New upstream development version 1.45.99 (preview of 2.0)