bk commit into 5.0 tree (lenz:1.2022)

[lenz]

Below is the list of changes that have just been committed into a local
5.0 repository of lenz. When lenz does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2022 05/09/29 14:35:07 lenz@stripped +1 -0
  Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0

  support-files/mysql.spec.sh
    1.115 05/09/29 14:35:04 lenz@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lenz
# Host:	metis.lenznet
# Root:	/space/my/mysql-5.0/RESYNC

--- 1.114/support-files/mysql.spec.sh	2005-08-25 05:05:55 +02:00
+++ 1.115/support-files/mysql.spec.sh	2005-09-29 14:35:04 +02:00
@@ -504,7 +504,7 @@
 
 # Clean up the BuildRoot
 %clean
-[ "$RBR" != "/" ] && [ -d $RBR ] && rm -rf $RBR;
+[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
 
 %files server
 %defattr(-,root,root,0755)
@@ -668,6 +668,11 @@
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Thu Sep 29 2005 Lenz Grimmer <lenz@stripped>
+
+- fixed the removing of the RPM_BUILD_ROOT in the %clean section (the
+  $RBR variable did not get expanded, thus leaving old build roots behind)
+
 * Thu Aug 04 2005 Lenz Grimmer <lenz@stripped>
 
 - Fixed the creation of the mysql user group account in the postinstall