forked from pool/spack
Accepting request 1057809 from home:eeich:branches:network:cluster
- Fix var_path: this regression was introduced with the update to the 0.19.0 release (boo#1207053). - Move repos to /usr/share/spack: /var is strictly for local data. OBS-URL: https://build.opensuse.org/request/show/1057809 OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=54
This commit is contained in:
13
spack.spec
13
spack.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package spack
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -256,9 +256,6 @@ find . -type f -name .gitlab-ci.yml -delete
|
||||
# Fix _spack_root link
|
||||
rm -f lib/spack/docs/_spack_root
|
||||
ln -sf ../.. lib/spack/docs/_spack_root
|
||||
# Do not ship Docker and container building for now - needs fixing
|
||||
rm -rf share/spack/{templates/container}
|
||||
rm -rf share/spack/docker/{centos,ubuntu}*.dockerfile
|
||||
# Do not ship AWS specifics
|
||||
rm -f share/spack/setup-tutorial-env.sh
|
||||
# Fix rpmlint warnings
|
||||
@@ -288,6 +285,8 @@ cp -r etc %{buildroot}%{_prefix}
|
||||
cp -r lib/spack/{env,external,llnl,spack,spack_installable} %{buildroot}%{spack_dir}
|
||||
cp -r share/spack/* %{buildroot}%{_datarootdir}/spack
|
||||
cp -r var/spack/* %{buildroot}%{_localstatedir}/lib/spack
|
||||
# No repos in /var
|
||||
mv %{buildroot}%{_localstatedir}/lib/spack/repos %{buildroot}%{_datarootdir}/spack
|
||||
cp -r bin/sbang %{buildroot}/%{_bindir}
|
||||
cp -r bin/spack* %{buildroot}%{_bindir}/
|
||||
cp etc/spack/defaults/config.yaml %{buildroot}%{_sysconfdir}/skel/.spack/
|
||||
@@ -407,7 +406,7 @@ rm -f %{buildroot}%{_localstatedir}/lib/spack/cache
|
||||
ln -sf %{_localstatedir}/cache/spack %{buildroot}%{_localstatedir}/lib/spack/cache
|
||||
# Remove problematic binaries which are removed upstream with
|
||||
# 0889be20e0d9dcdf4346cdeaa0647285187375f3
|
||||
rm -r %{buildroot}%{_localstatedir}/lib/spack/repos/builtin/packages/patchelf/test/
|
||||
rm -r %{buildroot}%{_datarootdir}/spack/repos/builtin/packages/patchelf/test/
|
||||
|
||||
echo "g %{name} -" > system-group-%{name}.conf
|
||||
%sysusers_generate_pre system-group-%{name}.conf %{name} system-group-%{name}.conf
|
||||
@@ -477,6 +476,7 @@ chmod 0775 /opt/spack
|
||||
%{_localstatedir}/cache/spack
|
||||
%{_localstatedir}/lib/spack
|
||||
%{_datarootdir}/spack
|
||||
%exclude %{_datarootdir}/spack/repos
|
||||
%config %{_sysconfdir}/profile.d/spack.sh
|
||||
%ghost %config %{_sysconfdir}/spack/packages.yaml
|
||||
%config %{_sysconfdir}/profile.d/spack.csh
|
||||
@@ -485,12 +485,11 @@ chmod 0775 /opt/spack
|
||||
%config %{_sysconfdir}/skel/.spack/modules.yaml
|
||||
# repos directory is installed in -recipes
|
||||
%{_sysusersdir}/system-group-%{name}.conf
|
||||
%exclude %{_localstatedir}/lib/spack/repos
|
||||
|
||||
%files recipes
|
||||
%license COPYRIGHT LICENSE-APACHE LICENSE-MIT
|
||||
%doc CHANGELOG.md NOTICE README.md
|
||||
%{_localstatedir}/lib/spack/repos
|
||||
%{_datarootdir}/spack/repos
|
||||
|
||||
%else
|
||||
|
||||
|
Reference in New Issue
Block a user