From 8a571f87383410a95f700a7e6ab4fe8396d39bd4c13cba2532793cd2f4df9988 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Wed, 11 Jan 2023 23:27:26 +0000
Subject: [PATCH] Accepting request 1057874 from
 home:eeich:branches:network:cluster

- Some more fixes to make the switch from /var/lib/spack/repo
  to /usr/share/spack/repo work.

OBS-URL: https://build.opensuse.org/request/show/1057874
OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=56
---
 spack.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spack.spec b/spack.spec
index 960a1c7..c037ee9 100644
--- a/spack.spec
+++ b/spack.spec
@@ -231,14 +231,15 @@ cd -
 grep -rl '#! /usr/bin/env bash' . | xargs -i@ sed -i 's|#! /usr/bin/env bash|#!/usr/bin/bash|g' @
 grep -rl '#!/bin/env sh' . | xargs -i@ sed -i 's|#!/bin/env sh|#!/usr/bin/sh|g' @
 grep -rl '#!/usr/bin/env bash' . | xargs -i@ sed -i 's|#!/usr/bin/env bash|#!/usr/bin/bash|g' @
+grep -rl '/var/spack/repos' | grep -v "cmd/list.py" | \
+    xargs -i@ sed -i 's|/var/spack/repos|/usr/share/spack/repos|g' @
 grep -rl "spack/" . | xargs -i@ sed -i \
   -e 's|$spack/opt|/opt|g' \
   -e 's|$spack/var|/var/lib|g'\
+  -e 's|$spack/usr|/usr|g'\
   -e 's|$spack/share/spack/lmod|/opt/spack/modules|g'\
   -e 's|$spack/share/spack/modules|/opt/spack/modules|g'\
   @
-grep -rl '/var/spack/repos' | grep -v "cmd/list.py" | \
-    xargs -i@ sed -i 's|/var/spack/repos|/usr/share/spack/repos|g' @
 
 %install
 # combine READMEs