[mariadb-galera/f21] Rebase to version 10.0.15

[Honza Horak]

commit 2a28a65618428e94da6052a68669183117b91209
Author: Honza Horak <hhorak at redhat.com>
Date:   Sun Jan 25 00:16:59 2015 +0100

    Rebase to version 10.0.15

 .gitignore                     |    1 +
 mariadb-cipherspec.patch       |  115 ----------------------------------------
 mariadb-galera.spec            |   17 +++---
 rh-skipped-tests-arm.list      |    5 +--
 rh-skipped-tests-base.list     |    4 ++
 rh-skipped-tests-ppc-s390.list |    2 +
 sources                        |    2 +-
 7 files changed, 18 insertions(+), 128 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c7cd1e5..6610eb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /mariadb-galera-5.5.38.tar.gz
 /mariadb-galera-10.0.12.tar.gz
 /mariadb-galera-10.0.13.tar.gz
+/mariadb-galera-10.0.15.tar.gz
diff --git a/mariadb-galera.spec b/mariadb-galera.spec
index 10ad62e..97ac7f8 100644
--- a/mariadb-galera.spec
+++ b/mariadb-galera.spec
@@ -100,11 +100,11 @@
 # Make long macros shorter
 %global sameevr   %{epoch}:%{version}-%{release}
 %global compatver 10.0
-%global bugfixver 13
+%global bugfixver 15
 
 Name:             %{pkgname}
 Version:          %{compatver}.%{bugfixver}
-Release:          7%{?with_debug:.debug}%{?dist}
+Release:          1%{?with_debug:.debug}%{?dist}
 Epoch:            1
 
 Summary:          A community developed branch of MySQL
@@ -152,11 +152,10 @@ Patch1:           %{pkgnamepatch}-strmov.patch
 Patch2:           %{pkgnamepatch}-install-test.patch
 Patch3:           %{pkgnamepatch}-s390-tsc.patch
 Patch4:           %{pkgnamepatch}-logrotate.patch
-Patch5:           %{pkgnamepatch}-cipherspec.patch
-Patch6:           %{pkgnamepatch}-file-contents.patch
-Patch7:           %{pkgnamepatch}-dh1024.patch
-Patch8:           %{pkgnamepatch}-scripts.patch
-Patch9:           %{pkgnamepatch}-install-db-sharedir.patch
+Patch5:           %{pkgnamepatch}-file-contents.patch
+Patch6:           %{pkgnamepatch}-dh1024.patch
+Patch7:           %{pkgnamepatch}-scripts.patch
+Patch8:           %{pkgnamepatch}-install-db-sharedir.patch
 
 # Patches specific for this mysql package
 Patch30:          %{pkgnamepatch}-errno.patch
@@ -527,7 +526,6 @@ MariaDB is a community developed branch of MySQL.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 %patch30 -p1
 %patch31 -p1
 %patch32 -p1
@@ -1247,6 +1245,9 @@ fi
 %endif
 
 %changelog
+* Sat Jan 24 2015 Honza Horak <hhorak at redhat.com> - 1:10.0.15-1
+- Rebase to version 10.0.15
+
 * Thu Dec  4 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1:10.0.13-7
 - Build on aarch64 now we have galera
 
diff --git a/rh-skipped-tests-arm.list b/rh-skipped-tests-arm.list
index 635845c..061d0c5 100644
--- a/rh-skipped-tests-arm.list
+++ b/rh-skipped-tests-arm.list
@@ -8,8 +8,5 @@ perfschema.func_file_io   : rhbz#773116 cycle counter does not work on arm
 perfschema.func_mutex     : rhbz#773116 cycle counter does not work on arm
 
 connect.bin                                  : rhbz#1096787 (pass on aarch64)
-main.gis-precise                             : rhbz#1096787 (pass on armv7hl)
-main.openssl_1                               : rhbz#1096787
+main.key_cache                               : rhbz#1096787 (pass on aarch64)
 perfschema.setup_objects                     : rhbz#1096787
-innodb.innodb_simulate_comp_failures_small   : rhbz#1096787
-main.key_cache                               : rhbz#1096787
diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list
index d144318..794bea7 100644
--- a/rh-skipped-tests-base.list
+++ b/rh-skipped-tests-base.list
@@ -1,7 +1,11 @@
 # These tests fail with MariaDB 10:
 
 main.func_str                                : rhbz#1096787
+main.openssl_1                               : rhbz#1096787
+main.ssl                                     : rhbz#1096787
+main.ssl_compress                            : rhbz#1096787
 main.ssl_crl_clients                         : rhbz#1096787
+main.ssl_8k_key                              : rhbz#1096787
 perfschema.nesting                           : rhbz#1096787
 perfschema.socket_summary_by_event_name_func : rhbz#1096787
 perfschema.socket_summary_by_instance_func   : rhbz#1096787
diff --git a/rh-skipped-tests-ppc-s390.list b/rh-skipped-tests-ppc-s390.list
index e28c764..c484996 100644
--- a/rh-skipped-tests-ppc-s390.list
+++ b/rh-skipped-tests-ppc-s390.list
@@ -2,9 +2,11 @@ connect.alter                                : rhbz#1096787
 connect.bin                                  : rhbz#1096787
 connect.dbf                                  : rhbz#1096787
 connect.index                                : rhbz#1096787
+connect.mrr                                  : rhbz#1149647#c6
 connect.part_file                            : rhbz#1149647
 connect.part_table                           : rhbz#1149647
 connect.updelx                               : rhbz#1149647
+connect.updelx2                              : rhbz#1149647#c6
 main.gis-precise                             : rhbz#1096787
 main.statistics                              : rhbz#1096787
 multi_source.skip_counter                    : rhbz#1096787
diff --git a/sources b/sources
index 0855658..e376e5a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-efe28befea02afee96317b8b760f3706  mariadb-galera-10.0.13.tar.gz
+eaf628a5d4edba6a3e84c66403ebdde9  mariadb-galera-10.0.15.tar.gz