From 364e14ab49780e59383a5d16b466c82a62eda4d2f061857ec7f45d835aaade75 Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.com>
Date: Mon, 4 Oct 2021 13:55:13 +0000
Subject: [PATCH] Accepting request 922783 from
 home:eeich:branches:network:cluster

- Utilize sysuser infrastructure to set group spack.

OBS-URL: https://build.opensuse.org/request/show/922783
OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=31
---
 spack.changes |  5 +++++
 spack.spec    | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/spack.changes b/spack.changes
index 458b96c..dd1ff06 100644
--- a/spack.changes
+++ b/spack.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct  1 05:55:10 UTC 2021 - Egbert Eich <eich@suse.com>
+
+- Utilize sysuser infrastructure to set group spack. 
+
 -------------------------------------------------------------------
 Wed Sep 29 20:32:58 UTC 2021 - Antoine Ginies <aginies@suse.com>
 
diff --git a/spack.spec b/spack.spec
index dfb4bc4..7fa09d2 100644
--- a/spack.spec
+++ b/spack.spec
@@ -63,6 +63,7 @@ BuildRequires:  polkit
 BuildRequires:  python-base
 BuildRequires:  python3-urllib3
 BuildRequires:  sudo
+BuildRequires:  sysuser-tools
 Requires:       %{name}-recipes = %{version}
 Requires:       bzip2
 Requires:       curl
@@ -352,6 +353,11 @@ ln -sf %{_localstatedir}/cache/spack %{buildroot}%{_localstatedir}/lib/spack/cac
 # Remove problematic binaries which are removed upstream with
 # 0889be20e0d9dcdf4346cdeaa0647285187375f3
 rm -r %{buildroot}%{_localstatedir}/lib/spack/repos/builtin/packages/patchelf/test/
+
+echo "g %{name} -" > system-user-%{name}.conf
+%sysusers_generate_pre system-user-%{name}.conf %{name} system-user-%{name}.conf
+install -D -m 644 system-user-%{name}.conf %{buildroot}%{_sysusersdir}/system-user-%{name}.conf
+
 %fdupes %{buildroot}%{spack_dir}
 %fdupes %{buildroot}%{_datarootdir}/spack
 %fdupes %{buildroot}%{_localstatedir}/lib/spack
@@ -364,8 +370,7 @@ cp -r texinfo/Spack.info.gz %{buildroot}%{_infodir}
 [ -d texinfo/Spack-figures ] && cp -r texinfo/Spack-figures %{buildroot}%{_infodir}
 %endif
 
-%pre
-getent group %spack_group >/dev/null || groupadd -r %spack_group
+%pre -f %{name}.pre
 
 %post
 # Replace /etc/spack/compilers.yaml
@@ -419,6 +424,7 @@ sed -i "s@HOSTTYPE@$HOSTTYPE@" %{spack_dir}/etc/spack/compilers.yaml
 %dir %{_sysconfdir}/skel/.spack
 %config %{_sysconfdir}/skel/.spack/config.yaml
 # repos directory is installed in -recipes
+%{_sysusersdir}/system-user-%{name}.conf
 %exclude %{_localstatedir}/lib/spack/repos
 
 %files recipes