From c0c63684bf57bf2ca145da6ca7d6af13d981be3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jstanek@redhat.com>
Date: Thu, 20 Nov 2014 14:09:59 +0100
Subject: [PATCH] Applied upstream fix for mysql_config --cflags output.

  Resolves: #1160845
---
 mariadb-10.0.14-mysql_config-cflags.patch | 20 ++++++++++++++++++++
 mariadb.spec                              |  8 +++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 mariadb-10.0.14-mysql_config-cflags.patch

diff --git a/mariadb-10.0.14-mysql_config-cflags.patch b/mariadb-10.0.14-mysql_config-cflags.patch
new file mode 100644
index 0000000..89a22d9
--- /dev/null
+++ b/mariadb-10.0.14-mysql_config-cflags.patch
@@ -0,0 +1,20 @@
+# Fix leftover warning flags on mysql_config --cflags
+
+--- scripts/mysql_config.sh	2014-10-08 07:35:00 +0000
++++ scripts/mysql_config.sh	2014-11-18 14:43:01 +0000
+@@ -136,12 +136,12 @@
+ for remove in DDBUG_OFF DSAFE_MUTEX DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \
+               DEXTRA_DEBUG DHAVE_valgrind O 'O[0-9]' 'xO[0-9]' 'W[-A-Za-z]*' \
+               'mtune=[-A-Za-z0-9]*' 'mcpu=[-A-Za-z0-9]*' 'march=[-A-Za-z0-9]*' \
+-              Xa xstrconst "xc99=none" AC99 \
++              Xa xstrconst "xc99=none" AC99 'W[-A-Za-z]*=[-A-Za-z0-9]*' \
+               unroll2 ip mp restrict
+ do
+   # The first option we might strip will always have a space before it because
+   # we set -I$pkgincludedir as the first option
+-  cflags=`echo "$cflags"|sed -e "s/ -$remove  */ /g"` 
++  cflags=`echo "$cflags"|sed -e ':again' -e "s/ -$remove  */ /g" -e 't again'`
+ done
+ cflags=`echo "$cflags"|sed -e 's/ *\$//'` 
+ 
+
diff --git a/mariadb.spec b/mariadb.spec
index d94db38..66d6ed3 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -107,7 +107,7 @@
 
 Name:             %{pkgname}
 Version:          %{compatver}.%{bugfixver}
-Release:          7%{?with_debug:.debug}%{?dist}
+Release:          8%{?with_debug:.debug}%{?dist}
 Epoch:            1
 
 Summary:          A community developed branch of MySQL
@@ -162,6 +162,7 @@ Patch33:          %{pkgnamepatch}-covscan-signexpr.patch
 Patch34:          %{pkgnamepatch}-covscan-stroverflow.patch
 Patch35:          %{pkgnamepatch}-config.patch
 Patch36:          %{pkgnamepatch}-ssltest.patch
+Patch37:          mariadb-10.0.14-mysql_config-cflags.patch
 
 BuildRequires:    cmake
 BuildRequires:    libaio-devel
@@ -495,6 +496,7 @@ MariaDB is a community developed branch of MySQL.
 %patch34 -p1
 %patch35 -p1
 %patch36 -p1
+%patch37 -p0
 
 # removing bundled cmd-line-utils
 rm -r cmd-line-utils
@@ -1186,6 +1188,10 @@ fi
 %endif
 
 %changelog
+* Thu Nov 20 2014 Jan Stanek <jstanek@redhat.com> - 1:10.0.14-8
+- Applied upstream fix for mysql_config --cflags output.
+  Resolves: #1160845
+
 * Fri Oct 24 2014 Jan Stanek <jstanek@redhat.com> - 1:10.0.14-7
 - Fixed compat service file.
   Resolves: #1155700