From 6acdee27dc444af6d7926cf7184df023b699aca713c23e0986ba9f511711e94b Mon Sep 17 00:00:00 2001
From: "Michal Hrusecky (old before rename to _miska_)"
 <michal.hrusecky@opensuse.org>
Date: Wed, 21 Aug 2013 12:53:18 +0000
Subject: [PATCH] - fix includedir in configuration file

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

diff --git a/build.inc b/build.inc
index 03d8b77..251b00f 100644
--- a/build.inc
+++ b/build.inc
@@ -114,8 +114,8 @@ BuildMySQL() {
 			-DWITH_EMBEDDED_SERVER=true                                  \
 			-DCOMPILATION_COMMENT="openSUSE package"                     \
 			-DDENABLE_DOWNLOADS=false                                    \
-			-DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin"            \
-			-DINSTALL_LIBDIR_RPM="%{_lib}"                            \
+			-DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin"               \
+			-DINSTALL_LIBDIR_RPM="%{_lib}"                               \
 			"$@" ..
 	make %{?jobs:-j%jobs}
 	nm --numeric-sort sql/mysqld > sql/mysqld.sym
diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2
index a1cbf17..9273f85 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:5e1d7b3da204d4812554888639fd49101b3a2d87c41bac802df35cf794ef088c
-size 312
+oid sha256:a5824b02d7cfe00333ac4adfec1856311fd27fafea7affc1656c5543a44db4a6
+size 318
diff --git a/install.inc b/install.inc
index 5742bbc..f34f681 100644
--- a/install.inc
+++ b/install.inc
@@ -1,5 +1,4 @@
 # install the debug server first, so that we don't overwrite the standard
-# /usr/sbin/mysqld
 mkdir -p %buildroot%_libdir/mysql
 make -C _build-debug/sql install DESTDIR=%buildroot
 mv %buildroot/usr/sbin/mysqld %buildroot/usr/sbin/mysqld-debug
@@ -10,16 +9,13 @@ install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym
 # remove handler socket client
 rm -f %buildroot%_libdir/libhsclient*
 rm -f %buildroot%_bindir/hsclient*
-if [ -f "%{buildroot}%{_bindir}/mytop" ]; then
-	mv %{buildroot}%{_bindir}/mytop %{buildroot}%{_bindir}/%{name}_mytop
-fi
+[ \! -f "%{buildroot}%{_bindir}/mytop" ] || mv %{buildroot}%{_bindir}/mytop %{buildroot}%{_bindir}/%{name}_mytop
 rm -f %buildroot%_libdir/mysql/plugin/handlersocket.so
 # remove most static libs (FIXME: don't build them at all...)
 [ \! -f "%buildroot%_libdir/"libmysqld.a ] || mv "%buildroot%_libdir/"libmysqld.a "%buildroot%_libdir/"libmysqld.static
 rm -f %buildroot%_libdir/*.a
 [ \! -f "%buildroot%_libdir/"libmysqld.static ] || mv "%buildroot%_libdir/"libmysqld.static "%buildroot%_libdir/"libmysqld.a
 rm -f %buildroot%_libdir/mysql/{,plugin}/*.{a,la}
-# XXX: package these? The ndb tools are linked statically atm
 rm -f %buildroot%_libdir/mysql/libndbclient.*
 rm -f %{buildroot}/usr/share/mysql-test/{mysql-test-run,mtr}
 rm -f %{buildroot}/usr/share/mysql/{binary-configure,errmsg-utf8.txt,magic,mysql-log-rotate,mysql*.server}
@@ -27,8 +23,7 @@ rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini
 ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr  
 ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run 
 mv %{buildroot}/usr/share/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir}
-# generate filelist for binaries and their manpages (easier than enumerating
-# all the binaries and manapages manually
+# generate filelist for binaries and their manpages
 filelist()
 {
 	echo '%%defattr(-, root, root)'
diff --git a/mariadb.changes b/mariadb.changes
index c8e2bed..a4b7ed5 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug 21 14:52:43 CEST 2013 - mhrusecky@suse.cz
+
+- fix includedir in configuration file
+
 -------------------------------------------------------------------
 Sat Aug 17 13:46:26 UTC 2013 - hrvoje.senjan@gmail.com
 
diff --git a/mariadb.spec b/mariadb.spec
index ee509e8..57df737 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -447,7 +447,7 @@ end
 %posttrans
 if [ -d /var/lib/mysql ]; then
 	touch /var/lib/mysql/.run-mysql_upgrade
-	chown -R mysql:mysql /var/lib/mysql
+	chown -R --no-dereference mysql:mysql /var/lib/mysql
 fi
 for i in /var/lib/mysql/{.protected,.tmp}; do
 	( [ -d "$i" ] && rmdir "$i" ) || :
diff --git a/my.ini b/my.ini
index 1f2d878..31853c2 100644
--- a/my.ini
+++ b/my.ini
@@ -98,6 +98,6 @@ log        = /var/log/mysqld_multi.log
 # socket     = /var/lib/mysql-databases/mysqld6/mysql.sock
 # user       = mysql
 
-!include_dir /etc/mysql
-!include_dir /etc/my.cnf.d
+!includedir /etc/mysql
+!includedir /etc/my.cnf.d
 
diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2
index 698b3be..6da9945 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:3c9a38335384fb99e0ac76488a2dd72cefa8fbca5f9f2b191c2348ecc64d6b0b
-size 13306
+oid sha256:166945cf5ab12a72f10c01211781dc3da69d71e6d24e55756220d2865af8654e
+size 13346