Accepting request 926030 from network:cluster

OBS-URL: https://build.opensuse.org/request/show/926030
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/spack?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger 2021-10-26 18:13:37 +00:00 committed by Git OBS Bridge
commit e4df56e7a1
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 15 17:00:57 UTC 2021 - Egbert Eich <eich@suse.com>
- Fix sysuser file name.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 1 05:55:10 UTC 2021 - Egbert Eich <eich@suse.com> Fri Oct 1 05:55:10 UTC 2021 - Egbert Eich <eich@suse.com>

View File

@ -354,9 +354,9 @@ ln -sf %{_localstatedir}/cache/spack %{buildroot}%{_localstatedir}/lib/spack/cac
# 0889be20e0d9dcdf4346cdeaa0647285187375f3 # 0889be20e0d9dcdf4346cdeaa0647285187375f3
rm -r %{buildroot}%{_localstatedir}/lib/spack/repos/builtin/packages/patchelf/test/ rm -r %{buildroot}%{_localstatedir}/lib/spack/repos/builtin/packages/patchelf/test/
echo "g %{name} -" > system-user-%{name}.conf echo "g %{name} -" > system-group-%{name}.conf
%sysusers_generate_pre system-user-%{name}.conf %{name} system-user-%{name}.conf %sysusers_generate_pre system-group-%{name}.conf %{name} system-group-%{name}.conf
install -D -m 644 system-user-%{name}.conf %{buildroot}%{_sysusersdir}/system-user-%{name}.conf install -D -m 644 system-group-%{name}.conf %{buildroot}%{_sysusersdir}/system-group-%{name}.conf
%fdupes %{buildroot}%{spack_dir} %fdupes %{buildroot}%{spack_dir}
%fdupes %{buildroot}%{_datarootdir}/spack %fdupes %{buildroot}%{_datarootdir}/spack
@ -424,7 +424,7 @@ sed -i "s@HOSTTYPE@$HOSTTYPE@" %{spack_dir}/etc/spack/compilers.yaml
%dir %{_sysconfdir}/skel/.spack %dir %{_sysconfdir}/skel/.spack
%config %{_sysconfdir}/skel/.spack/config.yaml %config %{_sysconfdir}/skel/.spack/config.yaml
# repos directory is installed in -recipes # repos directory is installed in -recipes
%{_sysusersdir}/system-user-%{name}.conf %{_sysusersdir}/system-group-%{name}.conf
%exclude %{_localstatedir}/lib/spack/repos %exclude %{_localstatedir}/lib/spack/repos
%files recipes %files recipes