diff --git a/mariadb.spec b/mariadb.spec index d264ef099d01f1f49679b087835551c982df331b..0bf437da1bf577ece6dc79a164f056ddf9f34f62 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 -3:10.3.9-9 +- Add conflict between mysql + * Mon Mar 2 2020 steven - 3:10.3.9-8 - Add requires exclude for perls and skip some test cases