From 952517bfd307e3b60cdc2cdccc4a5575b63a350b Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Thu, 19 Oct 2023 16:23:18 -0400
Subject: [PATCH] Add redistributable subpackage

srvany provides only mingw32 executables used by virt-v2v.  However, by
virtue of being installed in the mingw32 directory hierarchy, it is
handled as other mingw packages, and ends up pulling in mingw toolchain
components which are not needed for running virt-v2v.

This adds copies of the binaries outside of the mingw32 paths, avoiding
unnecessary mingw dependency detection, and directly into the location
where virt-v2v expects them.  When virt-v2v is subsequently modified to
use this new subpackage, it will no longer pull in the toolchain.
---
 mingw-srvany.spec | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/mingw-srvany.spec b/mingw-srvany.spec
index de0e5ab..550ddb2 100644
--- a/mingw-srvany.spec
+++ b/mingw-srvany.spec
@@ -6,7 +6,7 @@
 
 Name:	        mingw-srvany
 Version:        1.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Utility for creating services for Windows
 
 License:        GPL-2.0-or-later
@@ -40,6 +40,18 @@ Utility for creating a service from any MinGW Windows binary
 %{?mingw_debug_package}
 
 
+%package redistributable
+Summary:	Utility for creating services for Windows
+# previously provided symlinks to the mingw32 path
+Conflicts:	virt-v2v < 1:2.3.5-4
+
+
+%description redistributable
+srvany is a utility for creating a service from any MinGW Windows binary.
+This package contains the binaries without any mingw toolchain dependencies,
+for use with virt-v2v.
+
+
 %prep
 %setup -q -n rhsrvany-%{version}
 cp %{SOURCE1} .
@@ -53,6 +65,8 @@ make %{?_smp_mflags}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
+# redistributable
+make DESTDIR=$RPM_BUILD_ROOT install bindir=%{_datadir}/virt-tools
 
 
 %files -n mingw32-srvany
@@ -60,8 +74,19 @@ make DESTDIR=$RPM_BUILD_ROOT install
 %{mingw32_bindir}/rhsrvany.exe
 %{mingw32_bindir}/pnp_wait.exe
 
+%files redistributable
+%doc COPYING
+%dir %{_datadir}/virt-tools/
+%{_datadir}/virt-tools/rhsrvany.exe
+%{_datadir}/virt-tools/pnp_wait.exe
+# duplicate debuginfo
+%exclude /usr/lib/debug%{_datadir}/virt-tools/*.debug
+
 
 %changelog
+* Thu Oct 19 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.1-6
+- Add redistributable subpackage
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild