From c4461656f5d223637edf4ea634fc4bb4c464f242 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Jul 05 2024 13:21:28 +0000
Subject: Merge remote-tracking branch 'fedora/rawhide' into c10s-sig-hyperscale


---

diff --git a/systemd.spec b/systemd.spec
index a741074..bc57008 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -278,11 +278,11 @@ Conflicts:      setup < 2.15.0-3
 Conflicts:      selinux-policy-any < 41.1
 %endif
 
-%if 0%{?fedora} >= 41
+%if 0%{?fedora} >= 41 || 0%{?rhel} >= 10
 # 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
-%else
+%elif 0%{?fedora}
 # Make sure that dracut supports systemd-executor and the renames done for v255.
 Conflicts:      dracut < 059-16
 %endif