From 1633330d4d3a13082d77e5f9a252b89e50bcea38 Mon Sep 17 00:00:00 2001
From: jinzhimin369 <jinzhimin2@huawei.com>
Date: Fri, 3 Jul 2020 18:17:37 +0800
Subject: [PATCH] add conflicts with mysql

---
 mariadb.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mariadb.spec b/mariadb.spec
index d264ef0..0bf437d 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -2,7 +2,7 @@
 
 Name:             mariadb
 Version:          10.3.9
-Release:          8
+Release:          9
 Epoch:            3
 Summary:          One of the most popular database servers
 License:          GPLv2 with exceptions and LGPLv2 and BSD
@@ -31,6 +31,7 @@ BuildRequires:    perl(Sys::Hostname), perl(Test::More), perl(Time::HiRes), perl
 Requires:         grep, bash, coreutils
 Requires:         %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
 Requires:         mariadb-connector-c >= 3.0
+Conflicts:        mysql
 Suggests:         %{name}-server%{?_isa} = %{epoch}:%{version}-%{release}
 Provides:         mariadb-galera = %{epoch}:%{version}-%{release}
 
@@ -599,6 +600,9 @@ fi
 
 
 %changelog
+* Fri Jul 3 2020 jinzhimin<jinzhimin2@huawei.com> -3:10.3.9-9
+- Add conflict between mysql
+
 * Mon Mar 2 2020 steven <steven_ygui@163.com> - 3:10.3.9-8
 - Add requires exclude for perls and skip some test cases
 
-- 
Gitee