Replace the tokudb Obsoletes to the right place

Resolves: #1928757
This commit is contained in:
Lukas Javorsky 2021-02-16 16:56:17 +01:00
parent f20aec3d3d
commit 7d46a8244f

View File

@ -158,7 +158,7 @@
Name: mariadb Name: mariadb
Version: 10.5.8 Version: 10.5.8
Release: 7%{?with_debug:.debug}%{?dist} Release: 8%{?with_debug:.debug}%{?dist}
Epoch: 3 Epoch: 3
Summary: A very fast and robust SQL database server Summary: A very fast and robust SQL database server
@ -484,6 +484,10 @@ Conflicts: community-mysql-server
# Bench subpackage has been deprecated in F32 # Bench subpackage has been deprecated in F32
Obsoletes: %{name}-bench <= %{sameevr} Obsoletes: %{name}-bench <= %{sameevr}
%if %{without tokudb}
Obsoletes: %{name}-tokudb-engine <= %{sameevr}
%endif
%description server %description server
MariaDB is a multi-user, multi-threaded SQL database server. It is a MariaDB is a multi-user, multi-threaded SQL database server. It is a
client/server implementation consisting of a server daemon (mysqld) client/server implementation consisting of a server daemon (mysqld)
@ -560,9 +564,6 @@ Requires: jemalloc
The TokuDB storage engine from Percona. The TokuDB storage engine from Percona.
%endif %endif
%if %{without tokudb}
Obsoletes: %{name}-tokudb-engine <= %{sameevr}
%endif
%if %{with cracklib} %if %{with cracklib}
%package cracklib-password-check %package cracklib-password-check
@ -1662,6 +1663,10 @@ fi
%endif %endif
%changelog %changelog
* Tue Feb 16 2021 Lukas Javorsky <ljavorsk@redhat.com> - 3:10.5.8-8
- Replace the tokudb Obsoletes to the right place
- Resolves: #1928757
* Fri Feb 12 2021 Michal Schorm <mschorm@redhat.com> - 3:10.5.8-7 * Fri Feb 12 2021 Michal Schorm <mschorm@redhat.com> - 3:10.5.8-7
- Enhance the logrotate script - Enhance the logrotate script
- Resolves: #1683981 - Resolves: #1683981