rpms
/
mariadb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix package Conflicts on other OS than Fedora 

The "community-mysql" package is named just "mysql" on RHEL & CentOS

Resolves: #1955704

Fedora upstream commit:
  939918b1e0?branch=rawhide
This commit is contained in:
Michal Schorm 2021-05-02 13:17:53 +00:00
parent 7929519a6b
commit 6d39bc1dbb
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mariadb.spec
View File

@ -161,7 +161,7 @@
Name: mariadb
Version: 10.5.9
Release: 7%{?with_debug:.debug}%{?dist}
Release: 8%{?with_debug:.debug}%{?dist}
Epoch: 3
Summary: A very fast and robust SQL database server
@ -319,7 +319,7 @@ Provides: mysql-compat-client%{?_isa} = %{sameevr}
Suggests: %{name}-server%{?_isa} = %{sameevr}
Conflicts: community-mysql
Conflicts: %{?fedora:community-}mysql
# Filtering: https://docs.fedoraproject.org/en-US/packaging-guidelines/AutoProvidesAndRequiresFiltering/
%global __requires_exclude ^perl\\((hostnames|lib::mtr|lib::v1|mtr_|My::|wsrep)
@ -477,7 +477,7 @@ Provides: mysql-server%{?_isa} = %{sameevr}
Provides: mysql-compat-server = %{sameevr}
Provides: mysql-compat-server%{?_isa} = %{sameevr}
%endif
Conflicts: community-mysql-server
Conflicts: %{?fedora:community-}mysql-server
# Bench subpackage has been deprecated in F32
Obsoletes: %{name}-bench <= %{sameevr}
@ -638,7 +638,7 @@ Requires: %{name}-server%{?_isa} = %{sameevr}
%if %{with mysql_names}
Provides: mysql-perl = %{sameevr}
%endif
Conflicts: community-mysql-server
Conflicts: %{?fedora:community-}mysql-server
# mysqlhotcopy needs DBI/DBD support
Requires: perl(DBI) perl(DBD::MariaDB)
@ -660,7 +660,7 @@ Requires: mariadb-connector-c-devel >= 3.0
Provides: mysql-devel = %{sameevr}
Provides: mysql-devel%{?_isa} = %{sameevr}
%endif
Conflicts: community-mysql-devel
Conflicts: %{?fedora:community-}mysql-devel
%description devel
MariaDB is a multi-user, multi-threaded SQL database server.
@ -703,7 +703,7 @@ Requires: libaio-devel
Provides: mysql-embedded-devel = %{sameevr}
Provides: mysql-embedded-devel%{?_isa} = %{sameevr}
%endif
Conflicts: community-mysql-embedded-devel
Conflicts: %{?fedora:community-}mysql-embedded-devel
%description embedded-devel
MariaDB is a multi-user, multi-threaded SQL database server.
@ -731,7 +731,7 @@ Requires: perl(Socket)
Requires: perl(Sys::Hostname)
Requires: perl(Test::More)
Requires: perl(Time::HiRes)
Conflicts: community-mysql-test
Conflicts: %{?fedora:community-}mysql-test
%if %{with mysql_names}
Provides: mysql-test = %{sameevr}
Provides: mysql-test%{?_isa} = %{sameevr}
@ -1680,6 +1680,9 @@ fi
%endif
%changelog
* Mon May 03 2021 Michal Schorm <mschorm@redhat.com> - 3:10.5.9-8
- Fix package Conflicts
* Fri Apr 30 2021 Michal Schorm <mschorm@redhat.com> - 3:10.5.9-7
- Rebuilt for RHEL 9 BETA