From 50cf48aea5accd63c80c728f6601e7353080505c Mon Sep 17 00:00:00 2001
From: Honza Horák <hhorak@redhat.com>
Date: Feb 28 2013 09:15:43 +0000
Subject: Use configured prefix value instead of guessing basedir in mysql_config; Resolves: #916189


---

diff --git a/mariadb-basedir.patch b/mariadb-basedir.patch
new file mode 100644
index 0000000..f5a5ebf
--- /dev/null
+++ b/mariadb-basedir.patch
@@ -0,0 +1,15 @@
+Don't guess basedir in mysql_config; we place it under _libdir because
+of multilib conflicts, so use rather configured @prefix@ path directly.
+
+diff -up mariadb-5.5.29/scripts/mysql_config.sh.basedir mariadb-5.5.29/scripts/mysql_config.sh
+--- mariadb-5.5.29/scripts/mysql_config.sh.basedir	2013-02-28 09:39:26.628440114 +0100
++++ mariadb-5.5.29/scripts/mysql_config.sh	2013-02-28 09:39:40.613439729 +0100
+@@ -76,7 +76,7 @@ get_full_path ()
+ 
+ me=`get_full_path $0`
+ 
+-basedir=`echo $me | sed -e 's;/bin/mysql_config;;'`
++basedir='@prefix@'
+ 
+ ldata='@localstatedir@'
+ execdir='@libexecdir@'
diff --git a/mariadb.spec b/mariadb.spec
index 0bf2f1b..5cba684 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -1,6 +1,6 @@
 Name: mariadb
 Version: 5.5.29
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 Summary: A community developed branch of MySQL
 Group: Applications/Databases
@@ -54,6 +54,7 @@ Patch12: mariadb-dh1024.patch
 Patch13: mariadb-man-plugin.patch
 Patch14: mariadb-buffer.patch
 Patch15: mariadb-sortbuffer.patch
+Patch16: mariadb-basedir.patch
 
 BuildRequires: perl, readline-devel, openssl-devel
 BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
@@ -289,6 +290,7 @@ MariaDB is a community developed branch of MySQL.
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 # workaround for upstream bug #56342
 rm -f mysql-test/t/ssl_8k_key-master.opt
@@ -787,6 +789,11 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Thu Feb 28 2013 Honza Horak <hhorak@redhat.com> 5.5.29-7
+- Use configured prefix value instead of guessing basedir
+  in mysql_config
+Resolves: #916189
+
 * Wed Feb 27 2013 Honza Horak <hhorak@redhat.com> 5.5.29-6
 - Fix sort_buffer_length option type