From 295b36a5a4c7b32b11053982b6aa270681266a771d8f32ca4dcab15df95a0ccf Mon Sep 17 00:00:00 2001
From: Kristyna Streitova <kstreitova@suse.com>
Date: Fri, 16 Mar 2018 12:38:14 +0000
Subject: [PATCH] Accepting request 587888 from
 home:kstreitova:branches:server:database

- 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

OBS-URL: https://build.opensuse.org/request/show/587888
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=210
---
 mariadb.changes | 10 ++++++++++
 mariadb.spec    | 12 ++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/mariadb.changes b/mariadb.changes
index ffedc6d..736d7f5 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+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
 
diff --git a/mariadb.spec b/mariadb.spec
index efe728f..a5fc4f2 100644
--- a/mariadb.spec
+++ b/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
@@ -250,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
-# during the update ("libmysqld18-10.1.25-3.1.x86_64 requires mariadb-errormessages
-# = 10.1.25, but this requirement cannot be provided").
-# Add the following Provides that solves this update issue.
-Provides:       mariadb-errormessages = 10.1.25
+Provides:       %{extra_provides}-errormessages = %{version}
+Obsoletes:      %{extra_provides}-errormessages < %{version}
 
 %description errormessages
 This package provides translated error messages for the standalone