Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package spack for openSUSE:Factory checked 
in at 2023-08-14 22:35:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/spack (Old)
 and      /work/SRC/openSUSE:Factory/.spack.new.11712 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "spack"

Mon Aug 14 22:35:47 2023 rev:35 rq:1103772 version:0.20.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/spack/spack.changes      2023-06-27 
23:17:54.635830839 +0200
+++ /work/SRC/openSUSE:Factory/.spack.new.11712/spack.changes   2023-08-14 
22:35:59.384503887 +0200
@@ -1,0 +2,6 @@
+Sun Aug 13 12:21:57 UTC 2023 - Egbert Eich <[email protected]>
+
+- Fix SPACK_ROOT setting in /etc/profile.d/spack.[c]sh (bsc#1214222).
+- Don't source /etc/os-release directly, use a subshell.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ spack.spec ++++++
--- /var/tmp/diff_new_pack.05jd8I/_old  2023-08-14 22:36:00.336509939 +0200
+++ /var/tmp/diff_new_pack.05jd8I/_new  2023-08-14 22:36:00.336509939 +0200
@@ -366,13 +366,13 @@
 # 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 @@
 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

Reply via email to