From: František Dvořák <valtri@civ.zcu.cz>
Date: Thu, 7 Mar 2013 15:23:02 +0000 (+0100)
Subject: Multiple builds from one source packages (honour top_srcdir).
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=43b3e44b46ab2364e0ad385edef7b9d0b73caaef;p=mock.git

Multiple builds from one source packages (honour top_srcdir).
---

diff --git a/mock.sh b/mock.sh
index 910cb0c..dcddca4 100755
--- a/mock.sh
+++ b/mock.sh
@@ -20,6 +20,7 @@
 #
 
 KEY_ID=${KEY_ID:-'7157882F'}
+top_srcdir=${top_srcdir}
 DEBREPO=~/debian
 DEBDISTRO=stable
 #PBUILDER_OPTS='--debbuildopts "-j8"'
@@ -119,12 +120,12 @@ pbuilder_build() {
 package() {
 	local file
 
-	if test -d $1/dist; then
+	if test -d $top_srcdir$1/dist; then
 		if test "$CONF" = "pbuilder"; then
-			file=`find $1/dist -maxdepth 1 -type f -name $2_\*.dsc | head -n 1`
+			file=`find $top_srcdir$1/dist -maxdepth 1 -type f -name $2_\*.dsc | head -n 1`
 			pbuilder_build $file
 		else
-			file=`find $1/dist -maxdepth 1 -type f -name $2-\*.src.rpm | head -n 1`
+			file=`find $top_srcdir$1/dist -maxdepth 1 -type f -name $2-\*.src.rpm | head -n 1`
 			mock_build $file
 		fi
 	else
@@ -152,10 +153,10 @@ while test -n "$1"; do
 
 	gridsite|grids)
 		if test "$CONF" = "pbuilder"; then
-			file=`find org.gridsite.core/RPMTMP -type f -name gridsite_\*.dsc | head -n 1`
+			file=`find ${top_srcdir}org.gridsite.core/RPMTMP -type f -name gridsite_\*.dsc | head -n 1`
 			pbuilder_build $file
 		else
-			file=`find org.gridsite.core/RPMTMP -type f -name gridsite-\*.src.rpm | head -n 1`
+			file=`find ${top_srcdir}org.gridsite.core/RPMTMP -type f -name gridsite-\*.src.rpm | head -n 1`
 			mock_build $file
 		fi
 		;;