From 337ca362b5b1113585a4f0fa21185e92ef2fcb0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 11 Feb 2025 14:36:25 +0100
Subject: [PATCH] Add sysusers.d config file to allow rpm to create
 users/groups automatically

See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers.
---
 dist-git.spec | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/dist-git.spec b/dist-git.spec
index fdcce5e..adbd02f 100644
--- a/dist-git.spec
+++ b/dist-git.spec
@@ -4,7 +4,7 @@
 
 Name:           dist-git
 Version:        1.18
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Package source version control system
 
 # upload.cgi uses GPLv1
@@ -26,7 +26,6 @@ Requires:       git
 Requires:       git-daemon
 Requires:       mod_ssl
 Requires:       crudini
-Requires(pre):  shadow-utils
 
 Requires:       python3-requests
 Recommends:     python3-grokmirror
@@ -76,6 +75,11 @@ This package includes SELinux support.
 %prep
 %setup -q
 
+# Create a sysusers.d config file
+cat >dist-git.sysusers.conf <<EOF
+g packager -
+EOF
+
 
 %build
 # ------------------------------------------------------------------------------
@@ -91,13 +95,6 @@ done
 cd -
 
 
-%pre
-# ------------------------------------------------------------------------------
-# Users and Groups
-# ------------------------------------------------------------------------------
-getent group packager > /dev/null || \
-    groupadd -r packager
-exit 0
 
 
 %check
@@ -171,6 +168,8 @@ cd -
 
 hardlink -cv %{buildroot}%{_datadir}/selinux
 
+install -m0644 -D dist-git.sysusers.conf %{buildroot}%{_sysusersdir}/dist-git.conf
+
 %post selinux
 for selinuxvariant in %{selinux_variants}
 do
@@ -246,6 +245,7 @@ fi
 %{_bindir}/mkbranch_branching
 %{_bindir}/remove_unused_sources
 %{_bindir}/setup_git_package
+%{_sysusersdir}/dist-git.conf
 
 
 %files selinux
@@ -254,6 +254,9 @@ fi
 
 
 %changelog
+* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.18-3
+- Add sysusers.d config file to allow rpm to create users/groups automatically
+
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.18-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild