From d8c4df3d29c5354c28ea5fe51546adaa3ad0f7b2 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrangé <berrange@redhat.com>
Date: May 03 2022 18:00:07 +0000
Subject: Drop redundant qemu-trace-stap copy from qemu-user-static (rhbz#2061584)


The static build of QEMU installs a copy of 'qemu-trace-stap' python
script, which gets renamed to 'qemu-trace-stap-static' by an overly
enthusiastic wildcard. This ends up adding a python dependency to
the qemu-user-static RPM, which is unhelpful.

Anyone who wants to trace QEMU user binaries with the stap helper
can easily install qemu-common as desired.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

---

diff --git a/qemu.spec b/qemu.spec
index e4a5c07..e88e45e 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -305,7 +305,7 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release}
 %endif
 
 # To prevent rpmdev-bumpspec breakage
-%global baserelease 1
+%global baserelease 2
 
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
@@ -1763,6 +1763,10 @@ mkdir -p %{static_buildroot}
 
 pushd %{static_builddir}
 make DESTDIR=%{static_buildroot} install
+
+# Duplicates what the main build installs and we don't
+# need second copy with a -static suffix
+rm -f %{static_buildroot}%{_bindir}/qemu-trace-stap
 popd  # static
 
 # Rename all QEMU user emulators to have a -static suffix
@@ -2318,6 +2322,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 
 
 %changelog
+* Tue May  3 2022 Daniel P. Berrangé <berrange@redhat.com> - 7.0.0-2
+- Drop redundant qemu-trace-stap copy from qemu-user-static (rhbz#2061584)
+
 * Fri Apr 08 2022 Eduardo Lima (Etrunko) <etrunko@redhat.com> - 7.0.0-1
 - Rebase to qemu 7.0.0-1