From 3b1ee643d819d1c3df170ba26f4351980f7ea10780779ac2482a3eb7bbdf83b8 Mon Sep 17 00:00:00 2001
From: "Michal Hrusecky (old before rename to _miska_)"
 <michal.hrusecky@opensuse.org>
Date: Fri, 23 May 2014 10:52:59 +0000
Subject: [PATCH] polish

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

diff --git a/build.inc b/build.inc
index 1bccdaf..d7c4845 100644
--- a/build.inc
+++ b/build.inc
@@ -118,7 +118,7 @@ BuildMySQL() {
 			-DDENABLE_DOWNLOADS=false                                    \
 			-DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin"               \
 			-DINSTALL_LIBDIR_RPM="%{_lib}"                               \
-			"$@" ..
+			-Wno-dev "$@" ..
 	make %{?jobs:-j%jobs}
 	nm --numeric-sort sql/mysqld > sql/mysqld.sym
 	popd
diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2
index a0123fd..ce73854 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:fe449958e77e4d7a03f6180e83b8c6bc12b004fcc4b139f8748779c7180cba2d
-size 312
+oid sha256:1bab94525f538ed0409299b3ba5abec093f4e3fd3e6e81f2d22d2f531f998259
+size 316
diff --git a/install.inc b/install.inc
index 324be7d..d82cff5 100644
--- a/install.inc
+++ b/install.inc
@@ -100,8 +100,6 @@ sed -i 's|@MYSQLVER@|%{version}|' '%buildroot'/etc/init.d/mysql
 ln -sf ../../etc/init.d/mysql '%buildroot'/usr/sbin/rcmysql
 sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/etc/init.d/mysql
 %endif
-# this is used by the init script
-install -m 755 -d %buildroot/var/run/mysql
 # SuSEfirewall service description
 install -D -m 644 %_sourcedir/mysql.SuSEfirewall2 \
 	%buildroot/etc/sysconfig/SuSEfirewall2.d/services/mysql
diff --git a/mariadb.spec b/mariadb.spec
index d4c34bf..d1f0ce8 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package mariadb
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -74,6 +74,7 @@ BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  libaio-devel
 BuildRequires:  libedit-devel
+BuildRequires:  libevent-devel
 BuildRequires:  libtool
 BuildRequires:  ncurses-devel
 BuildRequires:  openssl-devel
@@ -477,6 +478,7 @@ done
 if [ "`ls /etc/rc.d/rc*.d/S*mysql 2> /dev/null`" ] || [ -d %{_rundir}/mysql/restart ]; then
 	[ -x /usr/sbin/rcmysql ] && /usr/sbin/rcmysql start
 	rmdir %{_rundir}/mysql/restart || :
+	rmdir %{_rundir}/mysql         || :
 fi
 # warn on first run
 datadir="/var/lib/mysql"
@@ -552,7 +554,6 @@ fi
 %dir /usr/share/mysql
 /usr/share/%{name}/charsets/
 /usr/share/%{name}/*.sql
-%ghost %dir %attr(755,mysql,mysql)%{_rundir}/mysql
 %dir %{_libdir}/mysql
 %{_libdir}/mysql/mysqld.sym
 %config /etc/sysconfig/SuSEfirewall2.d/services/mysql
diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2
index e06906a..8db054c 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:6d38fbbdba838bd2f80cb8d278fbeeac0a182eb2f92ec035df1dee7b9c9417ff
-size 24470
+oid sha256:c09ba006de72fcfbea33dc2cf025b1fa0ab9aba2067be889bb4fa68b70c2005b
+size 24408