From a5af79eb3167d469ef1700bfe506e979398b09f95db197148f93ee6523e77ef3 Mon Sep 17 00:00:00 2001
From: "Michal Hrusecky (old before rename to _miska_)"
 <michal.hrusecky@opensuse.org>
Date: Mon, 16 May 2011 18:34:57 +0000
Subject: [PATCH] fixing other builds

OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=43
---
 build.inc             | 6 +++++-
 mysql-patches.tar.bz2 | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.inc b/build.inc
index a7b8afa..62d1b00 100644
--- a/build.inc
+++ b/build.inc
@@ -4,7 +4,11 @@
 %define socketpath /var/run/mysql
 %endif
 autoreconf -f -i
-export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS -fno-strict-aliasing -Wno-unused-parameter -Wno-unused-but-set-variable"
+export WARN_DIS=" -Wno-unused-parameter "
+%if 0%{?suse_version} > 1140
+export WARN_DIS="$WARN_DIS -Wno-unused-but-set-variable "
+%endif
+export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS -fno-strict-aliasing $WARN_DIS"
 export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti"
 # Make the compile a function, since we do multiple builds
 BuildMySQL() {
diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2
index d6ee9af..515d364 100644
--- a/mysql-patches.tar.bz2
+++ b/mysql-patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c4808970e068072814ba4cd122ba53a04137c495106bf71ad7a97a2c3243d198
-size 15827
+oid sha256:eea182884f15b81e7f627fff32fcca5bbec3388ae69cb9e2579ec219e3b65c4c
+size 16741