From 7bbbed556d74fc6d30790c064c8fc4c670df40d48e5ccc5976ea3f076f39355b Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Wed, 11 Jan 2023 21:36:28 +0000 Subject: [PATCH] Accepting request 1057863 from home:eeich:branches:network:cluster - Fix other issues when moving /var/spack/repos to /usr/share/spack OBS-URL: https://build.opensuse.org/request/show/1057863 OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=55 --- spack.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/spack.spec b/spack.spec index 1e6a8b3..960a1c7 100644 --- a/spack.spec +++ b/spack.spec @@ -167,15 +167,6 @@ done %else cp %{S:5} lib/spack/docs/ %endif -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 "spack/" . | xargs -i@ sed -i \ - -e 's|$spack/opt|/opt|g' \ - -e 's|$spack/var|/var/lib|g'\ - -e 's|$spack/share/spack/lmod|/opt/spack/modules|g'\ - -e 's|$spack/share/spack/modules|/opt/spack/modules|g'\ - @ %build # Nothing to build @@ -236,6 +227,18 @@ make man info || { cat /tmp/sphinx-err-*.log; exit 1; } #text dirhtml rm -rf $tmpdir gzip _build/texinfo/Spack.info _build/man/spack.1 %endif +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 "spack/" . | xargs -i@ sed -i \ + -e 's|$spack/opt|/opt|g' \ + -e 's|$spack/var|/var/lib|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