From 194a8c87198e4db0157ad75114ac281a96e247ad Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@redhat.com>
Date: Mon, 3 May 2021 11:55:19 -0400
Subject: [PATCH] releng: work around fedora ci

rpminspect appears to have a cow about -testsuite and -runtime-java
multiarch conflicts.  Perhaps adding a mutual Conflicts: will help.
---
 systemtap.spec | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/systemtap.spec b/systemtap.spec
index b9ee4176f..ea6ee9c8f 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -373,6 +373,13 @@ Requires: dejagnu which elfutils grep nc
 %if %{with_debuginfod}
 Requires: elfutils-debuginfod
 %endif
+# work around fedora ci gating kvetching about i686<->x86-64 conflicts
+%ifarch x86_64
+Conflicts: systemtap-testsuite = %{version}-%{release}.i686
+%endif
+%ifarch i686
+Conflicts: systemtap-testsuite = %{version}-%{release}.x86_64
+%endif
 Requires: gcc gcc-c++ make glibc-devel
 # testsuite/systemtap.base/ptrace.exp needs strace
 Requires: strace
@@ -432,6 +439,13 @@ Summary: Systemtap Java Runtime Support
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
 Requires: systemtap-runtime = %{version}-%{release}
+# work around fedora ci gating kvetching about i686<->x86-64 conflicts
+%ifarch x86_64
+Conflicts: systemtap-runtime = %{version}-%{release}.i686
+%endif
+%ifarch i686
+Conflicts: systemtap-runtime = %{version}-%{release}.x86_64
+%endif
 Requires: byteman > 2.0
 Requires: iproute
 Requires: java-devel
-- 
2.43.5