packages (NEWREPO): builder - debug on for now - redefine _specdir and _sou...

baggins baggins at pld-linux.org
Mon Apr 27 16:02:46 CEST 2009


Author: baggins                      Date: Mon Apr 27 14:02:46 2009 GMT
Module: packages                      Tag: NEWREPO
---- Log message:
- debug on for now
- redefine _specdir and _sourcedir for rpmbuild (ugly, needs cleaner solution)

---- Files affected:
packages:
   builder (1.573.2.1 -> 1.573.2.2) 

---- Diffs:

================================================================
Index: packages/builder
diff -u packages/builder:1.573.2.1 packages/builder:1.573.2.2
--- packages/builder:1.573.2.1	Mon Apr 27 15:43:29 2009
+++ packages/builder	Mon Apr 27 16:02:40 2009
@@ -42,7 +42,7 @@
 BE_VERBOSE=""
 QUIET=""
 CLEAN=""
-DEBUG=""
+DEBUG="1"
 NOURLS=""
 NOCVS=""
 NOCVSSPEC=""
@@ -1417,7 +1417,7 @@
 		fi
 		RES_FILE=$(mktemp -t builder.XXXXXX || ${TMPDIR:-/tmp}/builder.$RANDOM)
 
-		(time eval ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
+		(time eval ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
 		RETVAL=`cat $RES_FILE`
 		rm $RES_FILE
 		if [ -n "$LOGDIROK" ] && [ -n "$LOGDIRFAIL" ]; then
@@ -1428,7 +1428,7 @@
 			fi
 		fi
 	else
-		eval ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND $SPECFILE
+		eval ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $SPECFILE
 		RETVAL=$?
 	fi
 	if [ "$RETVAL" -ne "0" ]; then
@@ -1958,7 +1958,7 @@
 	cvs_entry_remove $PACKAGE_DIR $SPECFILE $SOURCES $PATCHES
 
 	# remove spec and sources
-	$RPMBUILD --clean --rmsource --rmspec --nodeps $SPECFILE
+	$RPMBUILD --clean --rmsource --rmspec --nodeps --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $SPECFILE
 }
 
 #---------------------------------------------
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/builder?r1=1.573.2.1&r2=1.573.2.2&f=u



More information about the pld-cvs-commit mailing list