Accepting request 998181 from network:cluster

OBS-URL: https://build.opensuse.org/request/show/998181
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/spack?expand=0&rev=24
This commit is contained in:
Dominique Leuenberger 2022-08-19 15:56:46 +00:00 committed by Git OBS Bridge
commit cb09a2e4a2
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Aug 15 19:39:22 UTC 2022 - Dirk Müller <dmueller@suse.com>
- avoid bashism in post scripts (bsc#1195391)
-------------------------------------------------------------------
Thu Apr 7 12:56:45 UTC 2022 - Egbert Eich <eich@suse.com>

View File

@ -337,7 +337,7 @@ EOF
mkdir -p %{buildroot}/%{_sysconfdir}/profile.d
cat > %{buildroot}/%{_sysconfdir}/profile.d/spack.sh <<EOF
source /etc/os-release
if [ "\${ID}" == "opensuse-tumbleweed" ] ; then
if [ "\${ID}" = "opensuse-tumbleweed" ] ; then
SPACK_NAME="\${ID/-/}"
else
SPACK_NAME="\${ID/-/_}\${VERSION_ID/.*/}"
@ -433,7 +433,7 @@ sed -i "s@GCC_FULL_VERSION@$GCC_FULL_VERSION@" %{spack_dir}/etc/spack/compilers.
sed -i "s@GCC_VERSION@$GCC_VERSION@" %{spack_dir}/etc/spack/compilers.yaml
if [ -e /etc/os-release ] ; then
source /etc/os-release
if [ "${ID}" == "opensuse-tumbleweed" ] ; then
if [ "${ID}" = "opensuse-tumbleweed" ] ; then
export SPACK_NAME="${ID/-/}"
else
export SPACK_NAME="${ID/-/_}${VERSION_ID/.*/}"