From: Elan Ruusamäe Date: Tue, 13 Oct 2020 08:50:52 +0000 (+0300) Subject: Restore tab-indenting X-Git-Tag: auto/th/rpm-build-tools-4.9-8~12 X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm-build-tools.git;a=commitdiff_plain;h=4a857a1 Restore tab-indenting refs ac1281919568d928bdefe8cbc5436cdf3fa5906d --- diff --git a/builder.sh b/builder.sh index 918692d..04f7fe1 100755 --- a/builder.sh +++ b/builder.sh @@ -687,7 +687,7 @@ EOF %_sourcedir ./ EOF fi - if rpm --version 2>&1 | grep -qE '5\.[0-9]+\.[0-9]+'; then + if rpm --version 2>&1 | grep -qE '5\.[0-9]+\.[0-9]+'; then safe_macrofiles=$(rpm $TARGET_SWITCH --showrc | awk -F: '/^macrofiles/ { gsub(/^macrofiles[ \t]+:/, "", $0); print $0 } ') eval PATH=$CLEAN_PATH $RPMBUILD $TARGET_SWITCH --macros "$safe_macrofiles:$BUILDER_MACROS" $QUIET $RPMOPTS $RPMBUILDOPTS $BCOND $* 2>&1 else