From 68f48aa515bad54a721d5c2240ada13a262eacbdbfb8feb684de34961179bba8 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Sun, 13 Aug 2023 12:55:40 +0000
Subject: [PATCH 1/2] Accepting request 1103700 from
 home:eeich:branches:network:cluster

- Fix SPACK_ROOT setting in /etc/profile.d/spack.[c]sh
- Don't source /etc/os-release directly, use a subshell.

OBS-URL: https://build.opensuse.org/request/show/1103700
OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=81
---
 spack.changes | 6 ++++++
 spack.spec    | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/spack.changes b/spack.changes
index 3a333be..9ea0b2d 100644
--- a/spack.changes
+++ b/spack.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Aug 13 12:21:57 UTC 2023 - Egbert Eich <eich@suse.com>
+
+- Fix SPACK_ROOT setting in /etc/profile.d/spack.[c]sh
+- Don't source /etc/os-release directly, use a subshell.
+
 -------------------------------------------------------------------
 Mon Jun 26 12:26:10 UTC 2023 - Egbert Eich <eich@suse.com>
 
diff --git a/spack.spec b/spack.spec
index aff1771..b46883e 100644
--- a/spack.spec
+++ b/spack.spec
@@ -366,13 +366,13 @@ EOF
 # This file properly sets MODULEPATH so lua-lmod can find the modules created by spack
 mkdir -p %{buildroot}/%{_sysconfdir}/profile.d
 cat > %{buildroot}/%{_sysconfdir}/profile.d/spack.sh <<EOF
-source /etc/os-release
+ID=\$(source /etc/os-release; echo \${ID})
 if [ "\${ID}" = "opensuse-tumbleweed" ] ; then
   SPACK_NAME="\${ID/-/}"
 else
   SPACK_NAME="\${ID/-/_}\${VERSION_ID/.*/}"
 fi
-export SPACK_ROOT=%{spack_dir}
+export SPACK_ROOT=%{_prefix}
 export MODULEPATH=~/spack/modules/linux-\${SPACK_NAME}-\${CPU}:%{_prefix}/share/spack/modules/linux-\${SPACK_NAME}-\${CPU}:\${MODULEPATH}
 # copy local configuration, if its not there
 if [ ! -e ~/.spack/config.yaml ] ; then
@@ -398,7 +398,7 @@ if ( \$ID == "opensuse_tumbleweed" ) then
 else
   set SPACK_NAME="\${ID}\${VERSION_ID}"
 endif
-set SPACK_ROOT="%{spack_dir}"
+set SPACK_ROOT="%{_prefix}"
 set MODULEPATH="~/spack/modules/linux-\${SPACK_NAME}-\${CPU}:%{_prefix}/share/spack/modules/linux-\${SPACK_NAME}-\${CPU}:\${MODULEPATH}"
 if ( ! -e ~/.spack/config.yaml )  then
   # test if user is in spack group by touching database

From 4edc51c078ae5a4bc4d5c854204d47a0e9b349a60358c3498450c74964819088 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Sun, 13 Aug 2023 15:23:56 +0000
Subject: [PATCH 2/2] - Fix SPACK_ROOT setting in /etc/profile.d/spack.[c]sh
 (bsc#1214222).

OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=82
---
 spack.changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spack.changes b/spack.changes
index 9ea0b2d..6e9e0e0 100644
--- a/spack.changes
+++ b/spack.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Sun Aug 13 12:21:57 UTC 2023 - Egbert Eich <eich@suse.com>
 
-- Fix SPACK_ROOT setting in /etc/profile.d/spack.[c]sh
+- Fix SPACK_ROOT setting in /etc/profile.d/spack.[c]sh (bsc#1214222).
 - Don't source /etc/os-release directly, use a subshell.
 
 -------------------------------------------------------------------