summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2005-09-29 13:57:41 +0200
committerunknown <lenz@mysql.com>2005-09-29 13:57:41 +0200
commit7af7e616043c98c0069c2df727e4c552bb670c91 (patch)
tree54602a8e2bdc418a99d4dda53c6a9ea1f79dc573 /support-files
parentf3ad7320523e341efeadfa46ef88a224a80d6dfd (diff)
parenta44907e7a6799e82edde89d7f2119d1f7160172d (diff)
downloadmariadb-git-7af7e616043c98c0069c2df727e4c552bb670c91.tar.gz
Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
support-files/mysql.spec.sh: Auto merged
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.spec.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index af9abd2fce1..0f597e1dda5 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -501,7 +501,7 @@ fi
# 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 @@ fi
# itself - note that they must be ordered by date (important when
# merging BK trees)
%changelog
+* Thu Sep 29 2005 Lenz Grimmer <lenz@mysql.com>
+
+- 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@mysql.com>
- Fixed the creation of the mysql user group account in the postinstall