SPECS: builder - fix for --init-rpm-dir; version 0.19

glen glen at pld-linux.org
Thu Aug 30 12:50:47 CEST 2007


Author: glen                         Date: Thu Aug 30 10:50:47 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix for --init-rpm-dir; version 0.19

---- Files affected:
SPECS:
   builder (1.513 -> 1.514) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.513 SPECS/builder:1.514
--- SPECS/builder:1.513	Sun Aug 26 00:16:54 2007
+++ SPECS/builder	Thu Aug 30 12:50:42 2007
@@ -22,7 +22,7 @@
 RCSID='$Id$'
 r=${RCSID#* * }
 rev=${r%% *}
-VERSION="v0.18/$rev"
+VERSION="v0.19/$rev"
 VERSIONSTRING="\
 Build package utility from PLD Linux CVS repository
 $VERSION (C) 1999-2007 Free Penguins".
@@ -610,8 +610,12 @@
 	fi
 
 	if [ "$NOINIT" != "yes" ] ; then
-		SOURCE_DIR="`eval $RPM $RPMOPTS --define '"name $ASSUMED_NAME"' --eval '%{_sourcedir}'`"
-		SPECS_DIR="`eval $RPM $RPMOPTS --define '"name $ASSUMED_NAME"' --eval '%{_specdir}'`"
+		local extra
+		if [ "$ASSUMED_NAME" ]; then
+			extra="--define 'name $ASSUMED_NAME'"
+		fi
+		SOURCE_DIR="`eval $RPM $RPMOPTS $extra --eval '%{_sourcedir}'`"
+		SPECS_DIR="`eval $RPM $RPMOPTS $extra --eval '%{_specdir}'`"
 	else
 		SOURCE_DIR="."
 		SPECS_DIR="."
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/builder?r1=1.513&r2=1.514&f=u



More information about the pld-cvs-commit mailing list