From 75f2103ee6360a09e01e6b20c1816b2aa0d1d947 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Jul 11 2024 09:44:07 +0000
Subject: Only exclude dracut conflicts on non-fedora on upstream builds


For the CentOS Stream Hyperscale SIG we backport a newer version of
dracut and still want the Conflicts to apply so let's conditionalize
the check on the %upstream macro since we only need it for upstream
builds anyway.

---

diff --git a/systemd.spec b/systemd.spec
index bc57008..401a8d6 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -282,7 +282,7 @@ Conflicts:      selinux-policy-any < 41.1
 # Make sure that dracut supports systemd-executor and the renames done for v255,
 # and dlopen libraries and read-only fs in initrd.
 Conflicts:      dracut < 060-2
-%elif 0%{?fedora}
+%elif 0%{?fedora} || %{without upstream}
 # Make sure that dracut supports systemd-executor and the renames done for v255.
 Conflicts:      dracut < 059-16
 %endif