From e664b92828ef438723a131afad80778d41bd8bac835b5d5edd3f25f41e2e8217 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 12 Jan 2023 11:55:47 +0000 Subject: [PATCH] Accepting request 1057973 from home:eeich:branches:network:cluster - Yet another fix for /var/spack/repos -> /usr/share/spack/repos move. OBS-URL: https://build.opensuse.org/request/show/1057973 OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=57 --- spack.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spack.spec b/spack.spec index c037ee9..50ad8af 100644 --- a/spack.spec +++ b/spack.spec @@ -202,6 +202,8 @@ sed -i 's/\(^SPHINXOPTS\).*/\1 = --keep-going /' Makefile grep -rl ":target:" | xargs sed -i -e "/:target:/s/^/#/" -e "/figure::/s/^/#/" # Fix path to var - we install this to the 'real' /var grep -rl "\$SPACK_ROOT/var" | xargs sed -i -e "s@\(.*\)\$SPACK_ROOT/var\(/spack.*\)@\1/var/lib\2@g" +grep -rl '/var/lib/spack/repos' | grep -v "cmd/list.py" | \ + xargs -i@ sed -i 's|/var/lib/spack/repos|/usr/share/spack/repos|g' @ # spack cannot run without knowing at least the compiler, so we inject # a dummy one mkdir -p ${HOME}/.spack/linux/ @@ -226,6 +228,7 @@ source /usr/share/spack/setup-env.sh make man info || { cat /tmp/sphinx-err-*.log; exit 1; } #text dirhtml rm -rf $tmpdir gzip _build/texinfo/Spack.info _build/man/spack.1 +# with doc %endif cd - grep -rl '#! /usr/bin/env bash' . | xargs -i@ sed -i 's|#! /usr/bin/env bash|#!/usr/bin/bash|g' @