From 36cb2f2b436f079d3345d95421c2acfb450cea7a Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Wed, 21 Jun 2023 12:59:13 +0300 Subject: [PATCH] Enable native user/group provide generation for the sysusers feature Currently systemd has it's own conflicting user/group provide generation but we need the rpm one for the sysuser integration. This must not proceed before https://src.fedoraproject.org/rpms/systemd/pull-request/109 is merged + built because this involves a file-level conflict. Note that this does NOT enable the sysuser integration in rpm, merely the provides generation, but doing so will allow people to begin testing the actual integration. --- rpm.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rpm.spec b/rpm.spec index ff85e80..4100c2c 100644 --- a/rpm.spec +++ b/rpm.spec @@ -57,6 +57,7 @@ License: GPLv2+ Requires: coreutils Requires: popt%{_isa} >= 1.10.2.1 Requires: curl +Conflicts: systemd < systemd-253.5-5.fc39 Obsoletes: python2-rpm < %{version}-%{release} %if %{with check} @@ -386,11 +387,6 @@ cmake \ %install cd _build %make_install - -# temporarily remove useser handling fileattr -# as it is currently in systemd-rpm-macros -rm $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/sysusers.attr - cd .. mkdir -p $RPM_BUILD_ROOT%{_unitdir} @@ -624,6 +620,10 @@ fi %doc %{_defaultdocdir}/rpm/API/ %changelog +* Wed Jun 21 2023 Panu Matilainen - 4.18.91-3 +- Enable user/group provide generation +- Add a conflict for systemd versions carrying their own + * Tue Jun 13 2023 Python Maint - 4.18.91-2 - Rebuilt for Python 3.12