From ecc89e18c1e2600afa0dd3a3bb34a3441d035e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 8 May 2025 15:05:35 +0200
Subject: [PATCH] Restore /usr/lib/rpm/sysusers.generate-pre.sh

... (rhbz#2363673)

Fixup for d70176a08632d259f127ed44eebb051a4637f31d. The macros were
restored, but not the helper script.
---
 macros.sysusers | 10 +++++-----
 systemd.spec    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/macros.sysusers b/macros.sysusers
index d8d8c1d..534b0e7 100644
--- a/macros.sysusers
+++ b/macros.sysusers
@@ -2,9 +2,9 @@
 #
 # Turn a sysusers.d file into macros specified by
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/UsersAndGroups/#_dynamic_allocation
+#
+# After https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers,
+# those macros are not needed anymore.
 
-%sysusers_requires_compat Requires(pre): shadow-utils
-
-%sysusers_create_compat() \
-%(%{_rpmconfigdir}/sysusers.generate-pre.sh %{?*}) \
-%{nil}
+%sysusers_requires_compat %nil
+%sysusers_create_compat() %nil
diff --git a/systemd.spec b/systemd.spec
index 70f629d..517ee20 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1064,7 +1064,7 @@ install -Dm0644 -t %{buildroot}%{_prefix}/lib/udev/rules.d/ %{SOURCE18}
 
 sed -i 's|#!/usr/bin/env python3|#!%{__python3}|' %{buildroot}/usr/lib/systemd/tests/run-unit-tests.py
 
-%if 0%{?fedora} >= 42
+%if 0%{?fedora} >= 43
 install -m 0644 -D %{SOURCE21} %{buildroot}%{_rpmconfigdir}/macros.d/macros.sysusers
 %else
 install -m 0644 -D %{SOURCE20} %{buildroot}%{_rpmconfigdir}/macros.d/macros.sysusers