Accepting request 587889 from server:database

OBS-URL: https://build.opensuse.org/request/show/587889
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=69

mariadb-10.2.13-aarch_compilefix.patch

@@ -0,0 +1,13 @@
+--- mariadb-10.2.13/storage/innobase/CMakeLists.txt	2018/03/13 23:32:34	1.1
++++ mariadb-10.2.13/storage/innobase/CMakeLists.txt	2018/03/13 23:33:42
+@@ -175,7 +175,10 @@
+       btr/btr0btr.cc
+       btr/btr0cur.cc
+       buf/buf0buf.cc
++      fts/fts0fts.cc
+       gis/gis0sea.cc
++      handler/handler0alter.cc
++      row/row0mysql.cc
+       COMPILE_FLAGS "-O0"
+       )
+   ENDIF()

mariadb.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Fri Mar 16 12:17:05 UTC 2018 - kstreitova@suse.com
+
+- change %{extra_provides} macro from "mariadb_102" to "mariadb-102"
+  and use this macro in Provides/Obsoletes for mariadb, test,
+  tools, bench and errormessages subpackages to ensure a smooth
+  transition from SLE12 to SLE15 [fate#323756]
+- remove "Provides: mariadb-errormessages = 10.1.25" that shouldn't
+  be needed anymore
+
+-------------------------------------------------------------------
+Wed Mar 14 00:35:11 CET 2018 - ro@suse.de
+
+- fix build on aarch64: compile a few more files with -O0
+  from https://jira.mariadb.org/browse/MDEV-14318
+  add patch mariadb-10.2.13-aarch_compilefix.patch
+
 -------------------------------------------------------------------
 Tue Feb 27 14:13:50 UTC 2018 - rsalevsky@suse.com
 

mariadb.spec

@@ -18,7 +18,10 @@
 
 # libmysqld soname
 %define soname 19
-%define extra_provides mariadb_102
+# Used in Provides/Obsoletes for mariadb, test, tools, bench and 
+# errormessages subpackages to ensure a smooth transition from SLE12
+# to SLE15 [fate#323756]
+%define extra_provides mariadb-102
 # Set this to 1 to run regression test suite (it takes a long time)
 %define run_testsuite 0
 # Set this to 1 for testing purposes (run all regression tests but ignore
@@ -82,6 +85,7 @@ Patch10:        mariadb-10.2.3-mysql_install_db-mariadb_dirs.patch
 Patch11:        mariadb-10.2.9-galera_cnf.patch
 Patch12:        mariadb-10.2.10-disable_openssl_compatibility_check.patch
 Patch13:        mariadb-10.2.14-xtrabackup-v2.patch
+Patch14:        mariadb-10.2.13-aarch_compilefix.patch
 BuildRequires:  bison
 BuildRequires:  cmake
 BuildRequires:  dos2unix
@@ -249,11 +253,8 @@ needed for running MariaDB Galera Cluster.
 Summary:        The error messages files required by server, client and libmysqld
 Group:          System/Localization
 BuildArch:      noarch
-# Old libmysqld18 requires an exact version of errormessages. This causes problem
+Provides:       %{extra_provides}-errormessages = %{version}
-# during the update ("libmysqld18-10.1.25-3.1.x86_64 requires mariadb-errormessages
+Obsoletes:      %{extra_provides}-errormessages < %{version}
-# = 10.1.25, but this requirement cannot be provided").
-# Add the following Provides that solves this update issue.
-Provides:       mariadb-errormessages = 10.1.25
 
 %description errormessages
 This package provides translated error messages for the standalone
@@ -342,6 +343,13 @@ applications with MariaDB.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%ifarch aarch64
+%if 0%{?suse_version} == 1315
+# gcc48 on sle12 on aarch64 has some optimisation issues
+# add some more files to the list of sources compiled with -O0
+%patch14 -p1
+%endif
+%endif
 
 cp %{_sourcedir}/suse-test-run .