From 732e3a6699afc25725d70bbe98cbc39d916f5c0fec16ffa66aeb9115f4a0d62d Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Mon, 18 Oct 2021 14:45:44 +0000 Subject: [PATCH] Accepting request 925529 from home:eeich:branches:network:cluster - Fix sysuser file name. OBS-URL: https://build.opensuse.org/request/show/925529 OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=34 --- spack.changes | 5 +++++ spack.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/spack.changes b/spack.changes index 82f7823..afa52aa 100644 --- a/spack.changes +++ b/spack.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 15 17:00:57 UTC 2021 - Egbert Eich + +- Fix sysuser file name. + ------------------------------------------------------------------- Fri Oct 1 05:55:10 UTC 2021 - Egbert Eich diff --git a/spack.spec b/spack.spec index 7fa09d2..f1b0fe4 100644 --- a/spack.spec +++ b/spack.spec @@ -354,9 +354,9 @@ ln -sf %{_localstatedir}/cache/spack %{buildroot}%{_localstatedir}/lib/spack/cac # 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 +echo "g %{name} -" > system-group-%{name}.conf +%sysusers_generate_pre system-group-%{name}.conf %{name} system-group-%{name}.conf +install -D -m 644 system-group-%{name}.conf %{buildroot}%{_sysusersdir}/system-group-%{name}.conf %fdupes %{buildroot}%{spack_dir} %fdupes %{buildroot}%{_datarootdir}/spack @@ -424,7 +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 +%{_sysusersdir}/system-group-%{name}.conf %exclude %{_localstatedir}/lib/spack/repos %files recipes