[mariadb/el6] Rebase to 5.5.32 https://kb.askmonty.org/en/mariadb-5532-changelog/

[Honza Horak]

commit 6e63eafb97aa19bf2636d17762acc07409cfd754
Author: Honza Horák <hhorak at redhat.com>
Date:   Tue Aug 20 10:01:03 2013 +0200

    Rebase to 5.5.32
    https://kb.askmonty.org/en/mariadb-5532-changelog/
    
    Conflicts:
    	mariadb.spec

 mariadb-man-plugin.patch |   16 --
 mariadb.spec             |   18 ++-
 mysql_plugin.1           |  388 ----------------------------------------------
 3 files changed, 10 insertions(+), 412 deletions(-)
---
diff --git a/mariadb.spec b/mariadb.spec
index 6cbd8bd..5058123 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -1,5 +1,5 @@
 Name: mariadb
-Version: 5.5.31
+Version: 5.5.32
 Release: 1%{?dist}
 
 Summary: A community developed branch of MySQL
@@ -24,8 +24,6 @@ Source9: mysql-embedded-check.c
 Source11: mysql.init
 Source14: rh-skipped-tests-base.list
 Source15: rh-skipped-tests-arm.list
-# mysql_plugin is missing in mariadb tar ball
-Source16: mysql_plugin.1
 # Working around perl dependency checking bug in rpm FTTB. Remove later.
 Source999: filter-requires-mysql.sh
 
@@ -42,7 +40,6 @@ Patch9: mariadb-cipherspec.patch
 Patch10: mariadb-file-contents.patch
 Patch11: mariadb-string-overflow.patch
 Patch12: mariadb-dh1024.patch
-Patch13: mariadb-man-plugin.patch
 Patch14: mariadb-basedir.patch
 
 BuildRequires: perl, readline-devel, openssl-devel
@@ -201,6 +198,8 @@ MariaDB is a community developed branch of MySQL.
 
 Summary: The test suite distributed with MariaD
 Group: Applications/Databases
+Requires: perl(Socket), perl(Time::HiRes)
+Requires: perl(Data::Dumper), perl(Test::More), perl(Env)
 Requires: real-%{name}%{?_isa} = %{version}-%{release}
 Requires: real-%{name}-libs%{?_isa} = %{version}-%{release}
 Requires: real-%{name}-server%{?_isa} = %{version}-%{release}
@@ -232,7 +231,6 @@ MariaDB is a community developed branch of MySQL.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
 %patch14 -p1
 
 # workaround for upstream bug #56342
@@ -252,9 +250,6 @@ cat %{SOURCE15} >> mysql-test/rh-skipped-tests.list
 echo "main.gis-precise : rhbz#906367" >> mysql-test/rh-skipped-tests.list
 %endif
 
-# install mysql_plugin
-cp -p %{SOURCE16} man/
-
 %build
 
 # fail quickly and obviously if user tries to build as root
@@ -460,6 +455,9 @@ rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/mysql
 # remove duplicate logrotate script
 rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/mysql
 
+# remove solaris files
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/solaris/
+
 %pre server
 /usr/sbin/groupadd -g 27 -o -r mysql >/dev/null 2>&1 || :
 /usr/sbin/useradd -M -N -g mysql -o -r -d /var/lib/mysql -s /bin/bash \
@@ -691,6 +689,10 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Tue Aug 19 2013 Honza Horak <hhorak at redhat.com> 5.5.32-1
+- Rebase to 5.5.32
+  https://kb.askmonty.org/en/mariadb-5532-changelog/
+
 * Mon Jun  3 2013 Honza Horak <hhorak at redhat.com> 5.5.31-1
 - Rebase to 5.5.31
   https://kb.askmonty.org/en/mariadb-5531-changelog/