From 7db154308bafbdf6a0898ce94b19aeff1928ecaa Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Jul 05 2024 09:09:10 +0000 Subject: Conditionalize dracut Conflicts more Make sure on centos stream 10 we also conflict with dracut 060-2 and that on centos stream 9 so that the spec can still be used to build systemd rpms for centos stream 9 upstream in systemd CI that can be installed on centos stream 9. (dracut is pulled in as a required dependency of kernel-core so we can't just not install it on centos stream 9 unfortunately). --- diff --git a/systemd.spec b/systemd.spec index 2321d4a..4d7e826 100644 --- a/systemd.spec +++ b/systemd.spec @@ -279,11 +279,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