[Aplaws-commit] r116 - tools/trunk/misc

[<ssk...@re...>]

Author: sskracic
Date: 2004-11-19 19:20:31 +0100 (Fri, 19 Nov 2004)
New Revision: 116

Modified:
   tools/trunk/misc/build-all.sh
Log:
  Removing the requirement of having ~/.rpmmacros file which
points _topdir to ~/rpm, since topdir macro definition is now passed
as a command line argument.


Modified: tools/trunk/misc/build-all.sh
===================================================================
--- tools/trunk/misc/build-all.sh	2004-11-19 18:03:46 UTC (rev 115)
+++ tools/trunk/misc/build-all.sh	2004-11-19 18:20:31 UTC (rev 116)
@@ -106,9 +106,10 @@
 RPM_DB=$VIRTUAL_ROOT/rpmdb
 RPM_ARGS="--dbpath $RPM_DB"
 
-HOMERPMDIR="$(eval echo ~$USER)/rpm/RPMS/noarch"
-HOMESRPMDIR="$(eval echo ~$USER)/rpm/SRPMS"
-HOMEBUILDDIR="$(eval echo ~$USER)/rpm/BUILD"
+HOMETOPDIR="$(echo ~/rpm)"
+HOMERPMDIR="$HOMETOPDIR/RPMS/noarch"
+HOMESRPMDIR="$HOMETOPDIR/SRPMS"
+HOMEBUILDDIR="$HOMETOPDIR/BUILD"
 RPMDIR="/var/ccm-devel/rpm/$USER/RPMS/noarch"
 SRPMDIR="/var/ccm-devel/rpm/$USER/SRPMS"
 
@@ -227,10 +228,12 @@
 %files
 EOF
 
-  rpmbuild -ba fake.spec
+  rpmbuild --define="_topdir $HOMETOPDIR" -ba fake.spec
 
   $RPM $RPM_ARGS -ivh $HOMERPMDIR/fake-2.0.0-1.noarch.rpm
 
+  export RPM_DIR=$HOMETOPDIR
+
 # Build the build tools
 for i in httpunit junit junitperf servlet servlet22
 do