From 065445600c369bd7a73a4384dafaf571d1cc79cb Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Tue, 11 May 2021 05:09:46 +0200 Subject: [PATCH] Rebase to 10.5.10 Cherry-picked from Fedora: https://src.fedoraproject.org/rpms/mariadb/c/b84b8cfc8cce2ebcc86ad998a9d3fb04ab5e2c30?branch=rawhide Related: #1971248 --- mariadb.spec | 10 ++++++---- sources | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index 93b7249..dafdaab 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -15,7 +15,7 @@ # The last version on which the full testsuite has been run # In case of further rebuilds of that version, don't require full testsuite to be run # run only "main" suite -%global last_tested_version 10.5.9 +%global last_tested_version 10.5.10 # Set to 1 to force run the testsuite even if it was already tested in current version %global force_run_testsuite 0 @@ -160,8 +160,8 @@ %global sameevr %{epoch}:%{version}-%{release} Name: mariadb -Version: 10.5.9 -Release: 9%{?with_debug:.debug}%{?dist} +Version: 10.5.10 +Release: 1%{?with_debug:.debug}%{?dist} Epoch: 3 Summary: A very fast and robust SQL database server @@ -1504,7 +1504,6 @@ fi %{_datadir}/%{pkg_name}/mysql_system_tables.sql %{_datadir}/%{pkg_name}/mysql_system_tables_data.sql %{_datadir}/%{pkg_name}/mysql_test_data_timezone.sql -%{_datadir}/%{pkg_name}/mysql_to_mariadb.sql %{_datadir}/%{pkg_name}/mysql_performance_tables.sql %{_datadir}/%{pkg_name}/mysql_test_db.sql %if %{with mroonga} @@ -1683,6 +1682,9 @@ fi %endif %changelog +* Tue May 11 2021 Michal Schorm - 10.5.10-1 +- Rebase to 10.5.10 + * Fri May 21 2021 Honza Horak - 3:10.5.9-9 - Fix OpenSSL 3.x compatibility Resolves: #1962047 diff --git a/sources b/sources index 06e3259..e575cd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mariadb-10.5.9.tar.gz) = d23d5bf8510b3c36a6521fb3244cf323ef0f5d100ba379ed7b5bbc2acae1765a5b46c17bd929f0b27b28923eb1b5975314abdf7ffb96905cf7a93a5c8837294e +SHA512 (mariadb-10.5.10.tar.gz) = 93dd1405f8b31989e130dee5b7d4a0b447aa0e017fb9ee02c792c52142d84d1103e8fd591101d72deda1ac65b10c48053582f6e61bd1757e6aa92e42d98c56cd