From 15fd29d40d9509f530fbd2168ce578be3e16923d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 12 Mar 2025 13:56:33 +0100 Subject: [PATCH] Add sysusers.d config file to allow rpm to create users/groups automatically forwarded from downstream dist-git with added if-conditions Related: https://github.com/fedora-copr/copr/issues/2789 --- dist-git/configs/sysusers.d/dist-git.conf | 1 + dist-git/dist-git.spec | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 dist-git/configs/sysusers.d/dist-git.conf diff --git a/dist-git/configs/sysusers.d/dist-git.conf b/dist-git/configs/sysusers.d/dist-git.conf new file mode 100644 index 0000000..509dd84 --- /dev/null +++ b/dist-git/configs/sysusers.d/dist-git.conf @@ -0,0 +1 @@ +g packager - diff --git a/dist-git/dist-git.spec b/dist-git/dist-git.spec index 3229023..080d256 100644 --- a/dist-git/dist-git.spec +++ b/dist-git/dist-git.spec @@ -26,7 +26,9 @@ Requires: git Requires: git-daemon Requires: mod_ssl Requires: crudini +%if 0%{?rhel} && 0%{?rhel} < 10 Requires(pre): shadow-utils +%endif Requires: python3-requests Recommends: python3-grokmirror @@ -92,13 +94,14 @@ cd - %pre +%if 0%{?rhel} && 0%{?rhel} < 10 # ------------------------------------------------------------------------------ # Users and Groups # ------------------------------------------------------------------------------ getent group packager > /dev/null || \ groupadd -r packager exit 0 - +%endif %check %if 0%{?rhel} && 0%{?rhel} <= 8 @@ -131,6 +134,8 @@ cp -a configs/httpd/dist-git.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/ cp -a configs/httpd/dist-git/* %{buildroot}%{_sysconfdir}/httpd/conf.d/dist-git/ cp -a configs/systemd/* %{buildroot}%{_unitdir}/ +install -m0644 -D configs/sysusers.d/dist-git.conf %{buildroot}%{_sysusersdir}/dist-git.conf + # ------------------------------------------------------------------------------ # /var/lib/ ...... dynamic persistent files # ------------------------------------------------------------------------------ @@ -247,6 +252,7 @@ fi %{_bindir}/remove_unused_sources %{_bindir}/setup_git_package +%{_sysusersdir}/dist-git.conf %files selinux %doc selinux/*