From 58b0f1d66dc301ba5bae1c14c34b3087511ee382719a9c7a3625e701d9133aea Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.com>
Date: Tue, 6 Jul 2021 14:49:33 +0000
Subject: [PATCH] Accepting request 904401 from home:mslacken:sp

- removed
  Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch
  as this fixes bsc#1188040

>>>>>>> ./spack.changes.r935baeb217850b583c41a8f55bbd82e3

OBS-URL: https://build.opensuse.org/request/show/904401
OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=25
---
 ...ld-due-to-recursive-module-inclusion.patch | 40 -------------------
 spack.changes                                 |  8 ++++
 spack.spec                                    |  4 --
 3 files changed, 8 insertions(+), 44 deletions(-)
 delete mode 100644 Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch

diff --git a/Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch b/Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch
deleted file mode 100644
index 7cb9f6c..0000000
--- a/Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Egbert Eich <eich@suse.com>
-Date: Thu Feb 4 09:17:55 2021 +0100
-Subject: Fix error during documentation build due to recursive module inclusion
-Patch-mainline: Not yet
-Git-commit: 7102b892cfc6e0697b658f35b7774a03bd1c42e9
-References: 
-
-Signed-off-by: Egbert Eich <eich@suse.com>
----
- lib/spack/spack/user_environment.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-diff --git a/lib/spack/spack/user_environment.py b/lib/spack/spack/user_environment.py
-index f08f21e..0da6c43 100644
---- a/lib/spack/spack/user_environment.py
-+++ b/lib/spack/spack/user_environment.py
-@@ -8,7 +8,7 @@
- import spack.config
- import spack.util.prefix as prefix
- import spack.util.environment as environment
--import spack.build_environment as build_env
-+import spack.build_environment
- 
- #: Environment variable name Spack uses to track individually loaded packages
- spack_loaded_hashes_var = 'SPACK_LOADED_HASHES'
-@@ -85,13 +85,13 @@ def environment_modifications_for_spec(spec, view=None):
-     # Let the extendee/dependency modify their extensions/dependents
-     # before asking for package-specific modifications
-     env.extend(
--        build_env.modifications_from_dependencies(
-+        build_environment.modifications_from_dependencies(
-             spec, context='run'
-         )
-     )
- 
-     # Package specific modifications
--    build_env.set_module_variables_for_package(spec.package)
-+    build_environment.set_module_variables_for_package(spec.package)
-     spec.package.setup_run_environment(env)
- 
-     return env
diff --git a/spack.changes b/spack.changes
index 7176ce7..8769ae5 100644
--- a/spack.changes
+++ b/spack.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  6 14:32:07 UTC 2021 - Christian Goll <cgoll@suse.com>
+
+- removed 
+  Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch 
+  as this fixes bsc#1188040
+
 -------------------------------------------------------------------
 Wed Jun  2 14:04:26 UTC 2021 - Antoine Ginies <aginies@suse.com>
 
@@ -34,6 +41,7 @@ Mon May  3 06:34:46 UTC 2021 - Egbert Eich <eich@suse.com>
 - Add alternative c++ & fortran compilers to the triggers list.
 
 -------------------------------------------------------------------
+>>>>>>> ./spack.changes.r935baeb217850b583c41a8f55bbd82e3
 Tue Mar 30 14:31:26 UTC 2021 - Christian Goll <cgoll@suse.com>
 
 - added run-find-external.sh which calls the command in post
diff --git a/spack.spec b/spack.spec
index 033695c..27d0005 100644
--- a/spack.spec
+++ b/spack.spec
@@ -51,7 +51,6 @@ Patch2:         Adapt-shell-scripts-that-set-up-the-environment-for-different-sh
 Patch3:         added-dockerfile-for-opensuse-leap-15.patch
 Patch4:         added-target-and-os-calls-to-output-of-spack-spec-co.patch
 Patch5:         Fix-documentation-so-that-parser-doesn-t-stumble.patch
-Patch6:         Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch
 Patch7:         basic-exclude-pattern-for-external-find.patch
 # upstream patch removes also problemtatic binaries
 #Patch4:         spack-test-15702.patch
@@ -252,9 +251,6 @@ sed -i 's@\(\ssource_cache:\).*@\1 /var/tmp/$user/spack-cache@' %{buildroot}%{_s
 sed -i 's@\(\stcl:\).*@\1 ~/spack/modules@' %{buildroot}%{_sysconfdir}/skel/.spack/config.yaml
 sed -i 's@\(\slmod:\).*@\1 ~/spack/lmod@' %{buildroot}%{_sysconfdir}/skel/.spack/config.yaml
 cat >>  %{buildroot}%{_sysconfdir}/skel/.spack/config.yaml <<EOF
-# Timeout in seconds used for downloading sources etc. This only applies
-# to the connection phase and can be increased for slow connections or
-# servers. 0 means no timeout.
   binary_index_root: ~/.spack/indices
 EOF