From 4a2d9a4c52742abf2a40bcbaff6e5b4fb60a4edb Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Jun 30 2021 14:49:14 +0000
Subject: spec: Temporarily disable conflict between binfmt subpackages


Fedora CI can't handle subpackages with Conflicts. There's ongoing
work to make it happen:

https://pagure.io/fedora-ci/general/issue/184

Once that lands we can re-enable these conflicts.

Signed-off-by: Cole Robinson <crobinso@redhat.com>

---

diff --git a/qemu.spec b/qemu.spec
index d997db3..c0520ca 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -790,7 +790,10 @@ Requires: %{name}-user = %{epoch}:%{version}-%{release}
 Requires(post): systemd-units
 Requires(postun): systemd-units
 # qemu-user-binfmt + qemu-user-static both provide binfmt rules
-Conflicts: %{name}-user-static
+# Temporarily disable to get fedora CI working. Re-enable
+# once this CI issue let's us deal with subpackage conflicts:
+# https://pagure.io/fedora-ci/general/issue/184
+#Conflicts: qemu-user-static
 %description user-binfmt
 This package provides the user mode emulation of qemu targets
 
@@ -801,8 +804,11 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release}
 Requires(post): systemd-units
 Requires(postun): systemd-units
 # qemu-user-binfmt + qemu-user-static both provide binfmt rules
-Conflicts: %{name}-user-binfmt
-Provides: %{name}-user-binfmt
+# Temporarily disable to get fedora CI working. Re-enable
+# once this CI issue let's us deal with subpackage conflicts:
+# https://pagure.io/fedora-ci/general/issue/184
+#Conflicts: qemu-user-binfmt
+#Provides: qemu-user-binfmt
 %description user-static
 This package provides the user mode emulation of qemu targets built as
 static binaries