packages: builder - let --mr-proper respect builddir

cactus cactus at pld-linux.org
Sat Oct 1 18:46:55 CEST 2011


Author: cactus                       Date: Sat Oct  1 16:46:55 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- let --mr-proper respect builddir

---- Files affected:
packages:
   builder (1.653 -> 1.654) 

---- Diffs:

================================================================
Index: packages/builder
diff -u packages/builder:1.653 packages/builder:1.654
--- packages/builder:1.653	Thu Sep 29 21:32:48 2011
+++ packages/builder	Sat Oct  1 18:46:49 2011
@@ -2125,11 +2125,13 @@
 	get_spec
 	parse_spec
 
+	local builddir=$(eval $RPM $RPMOPTS --eval '%{_builddir}')
+	
 	# remove from CVS/Entries
 	cvs_entry_remove $PACKAGE_DIR $SPECFILE $SOURCES $PATCHES
 
 	# remove spec and sources
-	$RPMBUILD --clean --rmsource --rmspec --nodeps --define "_specdir $PACKAGE_DIR" --define "_sourcedir $PACKAGE_DIR" $SPECFILE
+	$RPMBUILD --clean --rmsource --rmspec --nodeps --define "_specdir $PACKAGE_DIR" --define "_sourcedir $PACKAGE_DIR" --define "_builddir $builddir" $SPECFILE
 }
 
 #---------------------------------------------
================================================================

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



More information about the pld-cvs-commit mailing list