From 27c0d43effb771da96dce99155dbdff8a33510d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 3 Jul 2022 21:31:32 +0200 Subject: [PATCH] Drop Obsoletes for systemd-standalone-{tmpfiles,sysusers} It turns out that with the Obsoletes, dnf will just install the normal systemd package if systemd-standalone-* is requested. The commit message for b36512ad8f06270739f85371d03f61bbf8e6fe2a which added this says I tested with local package builds (where it works), but not when going through the full repo with all packages. I'm adding the Provides instead, so that it's possible to request on or the other more easily. --- systemd.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/systemd.spec b/systemd.spec index a10e19f..95c5dca 100644 --- a/systemd.spec +++ b/systemd.spec @@ -207,9 +207,9 @@ Conflicts: fedora-release < 23-0.12 Obsoletes: timedatex < 0.6-3 Provides: timedatex = 0.6-3 Conflicts: %{name}-standalone-tmpfiles < %{version}-%{release}^ -Obsoletes: %{name}-standalone-tmpfiles < %{version}-%{release}^ +Provides: %{name}-tmpfiles = %{version}-%{release} Conflicts: %{name}-standalone-sysusers < %{version}-%{release}^ -Obsoletes: %{name}-standalone-sysusers < %{version}-%{release}^ +Provides: %{name}-sysusers = %{version}-%{release} # Recommends to replace normal Requires deps for stuff that is dlopen()ed Recommends: libidn2.so.0%{?elf_suffix} @@ -428,6 +428,7 @@ useful to test systemd internals. %package standalone-tmpfiles Summary: Standalone tmpfiles binary for use in non-systemd systems +Provides: %{name}-tmpfiles = %{version}-%{release} RemovePathPostfixes: .standalone %description standalone-tmpfiles @@ -437,6 +438,7 @@ package and is meant for use in non-systemd systems. %package standalone-sysusers Summary: Standalone sysusers binary for use in non-systemd systems +Provides: %{name}-sysusers = %{version}-%{release} RemovePathPostfixes: .standalone %description standalone-sysusers