From 986c00b139b6b9da6942d682fa9d9f70e2ce0b296c0ed403b13bb29c31b40e5f Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Sat, 11 Jul 2015 12:26:45 +0000
Subject: [PATCH] Accepting request 316014 from
 home:scarabeus_iv:branches:server:database

- Sync to git state, fixes bnc#937754 too

OBS-URL: https://build.opensuse.org/request/show/316014
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=178
---
 configuration-tweaks.tar.bz2 | 4 ++--
 mariadb.changes              | 5 +++++
 mariadb.spec                 | 8 ++++----
 mysql-patches.tar.bz2        | 4 ++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2
index 3010ff5..5ca563e 100644
--- a/configuration-tweaks.tar.bz2
+++ b/configuration-tweaks.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4daef1c77b163a4b79600d0a441aa84603d62c12515f79c5fd82da2c82e43075
-size 319
+oid sha256:d06d18f5c8475f73d299dfe2492b37d721f993751e7ac487cc24d589972ec8ea
+size 313
diff --git a/mariadb.changes b/mariadb.changes
index 4865303..ed20934 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jul 11 12:25:05 UTC 2015 - tchvatal@suse.com
+
+- Sync to git state, fixes bnc#937754 too
+
 -------------------------------------------------------------------
 Tue Jul  7 09:24:09 UTC 2015 - tchvatal@suse.com
 
diff --git a/mariadb.spec b/mariadb.spec
index 6b6d2ec..c456e4d 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -555,9 +555,9 @@ done
 # and thus broken later on. Fixes bnc#906147
 pushd "%{buildroot}%{_libdir}"
 rm -f lib%{libname}_r.so*
-ln -sf lib%{libname}%{soname}.so.%{soname}.0.0 lib%{libname}_r.so
-ln -sf lib%{libname}%{soname}.so.%{soname}.0.0 lib%{libname}_r.so.%{soname}
-ln -sf lib%{libname}%{soname}.so.%{soname}.0.0 lib%{libname}_r.so.%{soname}.0.0
+ln -sf lib%{libname}.so.%{soname}.0.0 lib%{libname}_r.so
+ln -sf lib%{libname}.so.%{soname}.0.0 lib%{libname}_r.so.%{soname}
+ln -sf lib%{libname}.so.%{soname}.0.0 lib%{libname}_r.so.%{soname}.0.0
 popd
 
 # If not preffered simply reduce main develpackage to NULL
@@ -632,7 +632,7 @@ usermod -g mysql -s /bin/false mysql
 /usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/mysql.conf || :
 
 # SLE11 Migration support
-for in in protected tmp; do
+for i in protected tmp; do
     rmdir "$datadir"/.$i 2>/dev/null || :
 done
 # Remove any messages that could've been in place about the upgrade
diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2
index f99b959..1f2c37e 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:d5ddecfa457d15482f6bcfa469278e89d164bb86bb1a02519a15218e056d1f40
-size 16518
+oid sha256:4a402573f978d63eef12baaa5e15af4a13a913b95b18fd70f75b6600ba416c1f
+size 16529