From cc8d14d6c180a5ec60da269490d578c64b8c8e77 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mar 29 2022 09:16:53 +0000 Subject: 250.3-6.3: Add Obsoletes/Provides for systemd-extras packages --- diff --git a/systemd.spec b/systemd.spec index 1c06077..da91ba8 100644 --- a/systemd.spec +++ b/systemd.spec @@ -43,7 +43,7 @@ Name: systemd Url: https://pagure.io/centos-sig-hyperscale/systemd %if %{without inplace} Version: 250.3 -Release: 6.2%{?dist} +Release: 6.3%{?dist} %else # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') @@ -318,6 +318,13 @@ Obsoletes: systemd < 245.6-1 Provides: udev = %{version} Provides: udev%{_isa} = %{version} Obsoletes: udev < 183 +# Obsolete the packages of the same name from systemd-extras in EPEL. +Obsoletes: %{name}-timesyncd < %{version}-%{release} +Provides: %{name}-timesyncd = %{version}-%{release} +Provides: %{name}-timesyncd%{_isa} = %{version}-%{release} +Obsoletes: %{name}-boot < %{version}-%{release} +Provides: %{name}-boot = %{version}-%{release} +Provides: %{name}-boot%{_isa} = %{version}-%{release} # Recommends to replace normal Requires deps for stuff that is dlopen()ed # used by dissect, integritysetup, veritysetyp, growfs, repart, cryptenroll, home @@ -395,6 +402,10 @@ systemd-journal-upload. %package networkd Summary: System daemon that manages network configurations Requires: %{name}%{?_isa} = %{version}-%{release} +# Obsolete the package of the same name from systemd-extras in EPEL. +Obsoletes: %{name}-networkd < %{version}-%{release} +Provides: %{name}-networkd = %{version}-%{release} +Provides: %{name}-networkd%{_isa} = %{version}-%{release} License: LGPLv2+ %description networkd @@ -1067,6 +1078,9 @@ fi %endif %changelog +* Tue Mar 29 2022 Daan De Meyer - 250.3-6.3 +- Added Obsoletes/Provides for packages shipped by systemd-extras + * Wed Mar 16 2022 Daan De Meyer - 250.3-6.2 - Backport PR #22757: BPF error logging improvements