summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorJoerg Bruehe <joerg.bruehe@oracle.com>2012-06-11 22:07:24 +0200
committerJoerg Bruehe <joerg.bruehe@oracle.com>2012-06-11 22:07:24 +0200
commit2c64e17361bb1560c51c7cb5285e46525593775a (patch)
treef824eeb0bb6c6e5530fa194a7e6e9c19360e4958 /support-files
parent4245d1bac29c82617ff4b3e18342874052e1bc32 (diff)
downloadmariadb-git-2c64e17361bb1560c51c7cb5285e46525593775a.tar.gz
Protect traditional RPMs that "SPECIFIC-ULN/" will not break their packaging.
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.spec.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index a3d8554188e..64016fd2ee6 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -406,6 +406,9 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
# Be strict about variables, bail at earliest opportunity, etc.
set -eu
+# Get rid of stuff for ULN RPMs - not needed here
+rm -fr %{src_dir}/SPECIFIC-ULN/
+
# Optional package files
touch optional-files-devel
@@ -1146,6 +1149,10 @@ echo "=====" >> $STATUS_HISTORY
# merging BK trees)
##############################################################################
%changelog
+* Mon Jun 11 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Make sure newly added "SPECIFIC-ULN/" directory does not disturb packaging.
+
* Wed Sep 28 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
- Fix duplicate mentioning of "mysql_plugin" and its manual page,