From 3838a69492df475b0868905099364a2e2c0324d09a1b203a96a83bb0bed23b97 Mon Sep 17 00:00:00 2001
From: Ana Guerrero <aguerrero@suse.com>
Date: Fri, 19 Mar 2021 16:07:22 +0000
Subject: [PATCH] Accepting request 880145 from
 home:anag:branches:home:mslacken:sp

- set the right MODULEPATH in /etc/profile.d/spack.[cs]h
- Remove BuildRequires for patterns-base-basesystem and
  distribution-release.
- update to version 0.16.1
  * intel-oneapi support through new packages
  * HIP/ROCm support (#19715, #20095)
  * concretization enhancements
  * environment install reporting fix (#20004)
  * avoid import in ABI compatibility info (#20236)
  * restore ability of dev-build to skip patches (#20351)
  * spack find -d spec grouping (#20028)
  * spack smoke test support (#19987, #20298)
  * abstract spec comparisons (#20341)
  * performance improvements for binary relocation (#19690, #20768)
  * additional sanity checks for variants in builtin packages (#20373)
  * do not pollute auto-generated configuration files with empty lists or
    dicts
- added file: basic-exclude-pattern-for-external-find.patch
  * adds the functionality to exclude binaries for external search
    so that the call 'installdbgsymbols' can be prohibited as this
    leads to an endless loop when drkonqui is installed

- Add
  * Fix-documentation-so-that-parser-doesn-t-stumble.patch:
  * Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch
    Fix documentation building.
- Fix texinfo file installation.
- added patch for more reproduceable output for the doc package
  * added file: added-target-and-os-calls-to-output-of-spack-spec-co.patch
- added test for /etc/spack/no_rpm_trigger
- added %triggerin and %triggerpostun for the packages which
  can be detected by spack
- updated to 0.16.0
- added find for external packages
- added dockerfile for leap
  * added patchfile added-dockerfile-for-opensuse-leap-15.patch
- Add documentation (man and info pages, pdf doesn't build
  currently).
  * Do not ship documentation sources.
- Do not distribute Dockerfiles and other container related
  material, yet. This needs to be fixed so that the samples
  work with SUSE.
- Fully integrate spack into SUSE directory structure, fix
  paths where required.
  * Fix setup scripts to work correctly in above environment.
- added profile file for csh
- enabled projections
- updated README.SUSE
- added patches to be more on the traditional file system hierarchy
  and avoid explicit version in tumbleweed.
  * added file Make-spack-paths-compliant-to-distro-installation.patch
  * added file fix-tumbleweed-naming.patch
- Initial release. Version 0.15.4
  * Make-spack-paths-compliant-to-distro-installation.patch
    Make spack paths compliant to distro installation.

OBS-URL: https://build.opensuse.org/request/show/880145
OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=13
---
 spack.changes | 5 +++++
 spack.spec    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/spack.changes b/spack.changes
index 1a103bd..2ae9aa7 100644
--- a/spack.changes
+++ b/spack.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar 19 15:04:20 UTC 2021 - Christian Goll <cgoll@suse.com>
+
+- set the right MODULEPATH in /etc/profile.d/spack.[cs]h 
+
 -------------------------------------------------------------------
 Fri Feb 26 22:06:36 UTC 2021 - Egbert Eich <eich@suse.com>
 
diff --git a/spack.spec b/spack.spec
index 4c23cad..b48704a 100644
--- a/spack.spec
+++ b/spack.spec
@@ -289,7 +289,7 @@ else
   SPACK_NAME="\${ID/-/_}\${VERSION_ID/.*/}"
 fi
 export SPACK_ROOT=%{spack_dir}
-export MODULEPATH=~/spack/lmod/linux-\${SPACK_NAME}-\${CPU}:%{_prefix}/share/spack/lmod/linux-\${SPACK_NAME}-\${CPU}:\${MODULEPATH}
+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
   # test if user is in spack group by touching database
@@ -313,7 +313,7 @@ else
   set SPACK_NAME="\${ID}\${VERSION_ID}"
 endif
 set SPACK_ROOT="%{spack_dir}"
-set MODULEPATH="~/spack/lmod/linux-\${SPACK_NAME}-\${CPU}:%{_prefix}/share/spack/lmod/linux-\${SPACK_NAME}-\${CPU}:\${MODULEPATH}"
+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
   touch %{spack_dir}/.spack-db  >& /dev/null