From d5617d26402d33266f8fe7db454b62387a312fba Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sat, 13 Feb 2010 19:11:57 +0000 Subject: [PATCH 1/1] - fix for ../builder being dir (if your LOGIN=builder ;P) Changed files: rpm.macros -> 1.536 --- rpm.macros | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm.macros b/rpm.macros index ed2612d..dabcdf5 100644 --- a/rpm.macros +++ b/rpm.macros @@ -58,8 +58,8 @@ # SPECS/SOURCES dirs exist (XXX: should be reverse?) %_topdir %{expand:%%global _topdir %(d=;\ d=${d:-$([ -d ../SPECS -a -d ../SOURCES ] && (cd .. && pwd))};\ - d=${d:-$([ -x ../builder ] && (cd ..; pwd))};\ - d=${d:-$([ -x builder ] && pwd)};\ + d=${d:-$([ -x ../builder -a ! -d ../builder ] && (cd ..; pwd))};\ + d=${d:-$([ -x builder -a ! -d builder ] && pwd)};\ echo ${d:-$HOME/rpm};\ )}%_topdir -- 2.44.0