From 92ceb7a4d5b3f907a8b4accad060d1f13243af6c Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Jul 16 2024 16:31:04 +0000
Subject: Merge remote-tracking branch 'fedora/rawhide' into c10s-sig-hyperscale


---

diff --git a/systemd.spec b/systemd.spec
index 412cb8a..c2c9791 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -246,7 +246,6 @@ Requires:       %{name}-libs%{_isa} = %{version}-%{release}
 %{?fedora:Recommends:     %{name}-resolved = %{version}-%{release}}
 Recommends:     diffutils
 Requires:       (util-linux-core or util-linux)
-Recommends:     libxkbcommon%{_isa}
 Provides:       /bin/systemctl
 Provides:       /sbin/shutdown
 Provides:       syslog
@@ -280,11 +279,11 @@ Conflicts:      dracut < 059-16
 
 Obsoletes:      timedatex < 0.6-3
 Provides:       timedatex = 0.6-3
-Conflicts:      %{name}-standalone-tmpfiles < %{version}-%{release}^
+Conflicts:      %{name}-standalone-tmpfiles
 Provides:       %{name}-tmpfiles = %{version}-%{release}
-Conflicts:      %{name}-standalone-sysusers < %{version}-%{release}^
+Conflicts:      %{name}-standalone-sysusers
 Provides:       %{name}-sysusers = %{version}-%{release}
-Conflicts:      %{name}-standalone-shutdown < %{version}-%{release}^
+Conflicts:      %{name}-standalone-shutdown
 Provides:       %{name}-shutdown = %{version}-%{release}
 
 %if "%{_sbindir}" == "%{_bindir}"
@@ -301,6 +300,7 @@ Provides:       /usr/sbin/telinit
 %endif
 
 # Recommends to replace normal Requires deps for stuff that is dlopen()ed
+Recommends:     libxkbcommon.so.0%{?elf_suffix}
 Recommends:     libidn2.so.0%{?elf_suffix}
 Recommends:     libidn2.so.0(IDN2_0.0.0)%{?elf_bits}
 Recommends:     libpcre2-8.so.0%{?elf_suffix}
@@ -451,7 +451,7 @@ Obsoletes:      u2f-hidraw-policy < 1.0.2-40
 # self-obsoletes to install both packages after split of systemd-boot
 Obsoletes:      systemd-udev < 252.2^
 
-Conflicts:      %{name}-standalone-repart < %{version}-%{release}^
+Conflicts:      %{name}-standalone-repart
 Provides:       %{name}-repart = %{version}-%{release}
 
 %if "%{_sbindir}" == "%{_bindir}"
@@ -626,6 +626,8 @@ useful to test systemd internals.
 %package standalone-repart
 Summary:       Standalone systemd-repart binary for use on systems without systemd
 Provides:      %{name}-repart = %{version}-%{release}
+Conflicts:     %{name}-udev
+Suggests:      coreutils-single
 RemovePathPostfixes: .standalone
 
 %description standalone-repart
@@ -636,6 +638,8 @@ package and is meant for use on systems without systemd.
 %package standalone-tmpfiles
 Summary:       Standalone systemd-tmpfiles binary for use on systems without systemd
 Provides:      %{name}-tmpfiles = %{version}-%{release}
+Conflicts:     %{name}
+Suggests:      coreutils-single
 RemovePathPostfixes: .standalone
 
 %description standalone-tmpfiles
@@ -646,6 +650,8 @@ package and is meant for use on systems without systemd.
 %package standalone-sysusers
 Summary:       Standalone systemd-sysusers binary for use on systems without systemd
 Provides:      %{name}-sysusers = %{version}-%{release}
+Conflicts:     %{name}
+Suggests:      coreutils-single
 RemovePathPostfixes: .standalone
 
 %description standalone-sysusers
@@ -656,6 +662,8 @@ package and is meant for use on systems without systemd.
 %package standalone-shutdown
 Summary:       Standalone systemd-shutdown binary for use on systems without systemd
 Provides:      %{name}-shutdown = %{version}-%{release}
+Conflicts:     %{name}
+Suggests:      coreutils-single
 RemovePathPostfixes: .standalone
 
 %description standalone-shutdown