From f4e284cd7a0c9850c326c0525f1fa9ae72a0d515 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@fedoraproject.org>
Date: Jul 19 2024 14:52:52 +0000
Subject: Merge #150 `Deal with systemd-timesyncd backport in EPEL`


---

diff --git a/systemd.spec b/systemd.spec
index 4c2542d..ca12e4e 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -426,6 +426,13 @@ Provides:       udev%{_isa} = %{version}
 Obsoletes:      udev < 183
 Requires:       (grubby > 8.40-72 if grubby)
 Requires:       (sdubby > 1.0-3 if sdubby)
+# A backport of systemd-timesyncd is shipped as a separate package in EPEL so
+# let's make sure we properly handle that.
+%if 0%{?rhel}
+Conflicts:      systemd-timesyncd < %{version}-%{release}
+Obsoletes:      systemd-timesyncd < %{version}-%{release}
+Provides:       systemd-timesyncd = %{version}-%{release}
+%endif
 
 # Libkmod is used to load modules. Assume that if we need udevd, we certainly
 # want to load modules, so make this into a hard dependency here.