"spec" file for RPM builds:

Fix yesterday's patch so that it also works for the last flag.
Still part of the fix for bug#40546.

support-files/mysql.spec.sh:
  The original "sed" command relied on a blank following the flag
  which should be removed for debug builds.
  This meant the last flag would not be matched.
  Change it so that the whole string is enclosed in blanks,
  demand leading and trailing blank for each flag,
  and finally strip the leading + trailing blank.

1 files changed, 10 insertions, 2 deletions

diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index dc80d379b83..7bb35e6072e 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -320,8 +320,12 @@ do
   # We are in a subshell, so we can modify variables just for one run.
   if test "$servertype" != ' '
   then
-	CFLAGS=`echo $CFLAGS | sed -e 's/-O[0-9]* //' -e 's/-unroll2 //' -e 's/-ip //'`
-	CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-O[0-9]* //' -e 's/-unroll2 //' -e 's/-ip //'`
+	CFLAGS=`echo   " $CFLAGS "   | \
+	    sed -e 's/ -O[0-9]* / /' -e 's/ -unroll2 / /' -e 's/ -ip / /' \
+	        -e 's/^ //' -e 's/ $//'`
+	CXXFLAGS=`echo " $CXXFLAGS " | \
+	    sed -e 's/ -O[0-9]* / /' -e 's/ -unroll2 / /' -e 's/ -ip / /' \
+	        -e 's/^ //' -e 's/ $//'`
   fi
 
   BuildMySQL "\
@@ -807,6 +811,10 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog
+* Fri Nov 07 2008 Joerg Bruehe <joerg@mysql.com>
+
+- Correct yesterday's fix, so that it also works for the last flag.
+
 * Thu Nov 06 2008 Joerg Bruehe <joerg@mysql.com>
 
 - Modify CFLAGS and CXXFLAGS such that a debug build is not optimized.