From 76d8effedd2d5e9b6a45f7cfb6e3c9ed513c7b1d7aea5ce5946ad19e08734c0d Mon Sep 17 00:00:00 2001
From: "Michal Hrusecky (old before rename to _miska_)"
 <michal.hrusecky@opensuse.org>
Date: Mon, 16 May 2011 09:42:12 +0000
Subject: [PATCH] - updated to MariaDB 5.2.6   * Release notes:    
 http://kb.askmonty.org/v/mariadb-526-release-notes   * Changelog:    
 http://kb.askmonty.org/v/mariadb-526-changelog

OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=41
---
 mariadb-5.2.5.tar.bz2 |  3 ---
 mariadb-5.2.6.tar.bz2 |  3 +++
 mariadb.changes       |  9 +++++++++
 mariadb.spec          | 14 +++++---------
 mysql-patches.tar.bz2 |  4 ++--
 series                |  9 ++++-----
 6 files changed, 23 insertions(+), 19 deletions(-)
 delete mode 100644 mariadb-5.2.5.tar.bz2
 create mode 100644 mariadb-5.2.6.tar.bz2

diff --git a/mariadb-5.2.5.tar.bz2 b/mariadb-5.2.5.tar.bz2
deleted file mode 100644
index b57f6ea..0000000
--- a/mariadb-5.2.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:51959de6ef021d704f90ce19ebb94a1a30cc8271ea1586004a58af3d81b4fd7d
-size 18819646
diff --git a/mariadb-5.2.6.tar.bz2 b/mariadb-5.2.6.tar.bz2
new file mode 100644
index 0000000..fe46ad4
--- /dev/null
+++ b/mariadb-5.2.6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0b83e85b5fab3bacddab8c4662ddcc0258cb4e18277d1bca5214c7b3bb7561df
+size 18987629
diff --git a/mariadb.changes b/mariadb.changes
index fff9408..1e91e1d 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sun May 15 18:53:40 CEST 2011 - mhrusecky@suse.cz
+
+- updated to MariaDB 5.2.6
+  * Release notes:
+    http://kb.askmonty.org/v/mariadb-526-release-notes
+  * Changelog:
+    http://kb.askmonty.org/v/mariadb-526-changelog
+
 -------------------------------------------------------------------
 Mon Mar 14 16:47:16 CET 2011 - mhrusecky@suse.cz
 
diff --git a/mariadb.spec b/mariadb.spec
index 017f851..a67209e 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -31,8 +31,8 @@
 
 Name:           mariadb
 Summary:        A True Multiuser, Multithreaded SQL Database Server
-Version:        5.2.5
-%define srv_vers   5.1.55
+Version:        5.2.6
+%define srv_vers   5.1.57
 Release:        0
 License:        GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT
 Group:          Productivity/Databases/Servers
@@ -385,16 +385,12 @@ advanced user.  They should be used with caution.
 #-------------------------------------------------------------------------------
 %prep
 #-------------------------------------------------------------------------------
-%setup -q -n mariadb-%{version} -D -a 9
+%setup -q -n mariadb-%version -D -a 9
 cp %_sourcedir/README.SuSE .
 cp %_sourcedir/suse-test-run .
 # apply patches from series
-ln -s mysql-patches/patches .
-cp %_sourcedir/series patches
-%if 0%{suse_version} < 1130
-sed -i '/mysql-community-server-5.1.53-ssl-compilation-fix.patch/ d' patches/series
-%endif
-mysql-patches/apply-series.sh patches/series
+mysql-patches/tools/quilt-setup.sh  "%{S:12}"
+mysql-patches/tools/apply-series.sh "%{S:12}"
 # remove unneeded manpages ('make install' basically installs everything under
 # man/*)
 rm -f man/mysqlman.1        # dummy fallback manpage
diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2
index 5282336..a15e1f2 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:66d6d6f1456368db891de70602fadab97a05ce950cf7f50a251acf742610b207
-size 14959
+oid sha256:789691a4c5a8584a8a09e37d1212b1df8bf5269fcda5ea66aa4140bfb174f6ca
+size 14117
diff --git a/series b/series
index 65921d2..c016797 100644
--- a/series
+++ b/series
@@ -3,18 +3,17 @@ mysql-community-server-5.1.33-scripts-paths.patch
 mysql-community-server-5.1.33-ssl-lib64-macro.patch
 mysql-community-server-5.1.36-bmove512.patch
 mysql-community-server-5.1.36-hotcopy.patch
-mysql-community-server-5.1.45-group.patch
+mariadb-5.2.6-group.patch
 mysql-community-server-5.1.45-multi-configuration.patch
-mysql-community-server-5.1.45-safe-process-in-bin.patch
+mariadb-5.2.6-safe-process-in-bin.patch
 mysql-community-server-5.1.46-logrotate.patch
 mariadb-5.1.50-strncat-overflow.patch
-mariadb-5.1.50-install_db-quiet.patch
+mariadb-5.2.6-install_db-quiet.patch
 mysql-community-server-5.1.51-myslq-test.patch
 mysql-community-server-5.1.51-mysql_config.patch
 mysql-community-server-5.1.51-mysqld_multi-features.patch
-mariadb-5.2.5-plugins-avoid-version.patch
+mariadb-5.2.6-plugins-avoid-version.patch
 mariadb-5.1.50-upgrade-exit-status.patch
 mariadb-5.2.3-cnf.patch
 mariadb-5.2.4-libmysql-no-pkglibdir.patch
 mysql-community-server-5.1.53-ssl-compilation-fix.patch
-mariadb-5.2.5-compilation-fix.patch