From 938a87d440e94475167e443cfedfc837ac420539 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Tue, 4 Jul 2023 11:39:01 +0200
Subject: [PATCH] Rebase to 10.7.8

---
 mariadb.spec | 12 +++++++++++-
 sources      |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/mariadb.spec b/mariadb.spec
index 151ba09..95b4d41 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -154,7 +154,7 @@
 %global sameevr   %{epoch}:%{version}-%{release}
 
 Name:             mariadb
-Version:          10.6.16
+Version:          10.7.8
 Release:          1%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
@@ -287,6 +287,8 @@ BuildRequires:    perl(warnings)
 # for running some openssl tests rhbz#1189180
 BuildRequires:    openssl openssl-devel
 
+BuildRequires:    fmt-devel
+
 %if %{with debug}
 BuildRequires:    valgrind-devel
 %endif
@@ -846,6 +848,7 @@ fi
          -DCONC_WITH_SSL=%{?with_clibrary:ON}%{!?with_clibrary:NO} \
          -DWITH_SSL=system \
          -DWITH_ZLIB=system \
+         -DWITH_LIBFMT=system \
          -DLZ4_LIBS=%{_libdir}/liblz4.so \
          -DLZ4_LIBS=%{?with_lz4:%{_libdir}/liblz4.so}%{!?with_lz4:} \
          -DWITH_INNODB_LZ4=%{?with_lz4:ON}%{!?with_lz4:OFF} \
@@ -866,6 +869,7 @@ fi
          -DPLUGIN_AWS_KEY_MANAGEMENT=NO \
          -DCONNECT_WITH_MONGO=OFF \
          -DCONNECT_WITH_JDBC=OFF \
+         -DPLUGIN_PROVIDER_LZMA=NO \
 %{?with_debug: -DCMAKE_BUILD_TYPE=Debug -DWITH_ASAN=OFF -DWITH_INNODB_EXTRA_DEBUG=ON -DWITH_VALGRIND=ON}
 
 # The -DSECURITY_HARDENED is used to force a set of compilation flags for hardening
@@ -1422,6 +1426,9 @@ fi
 %config(noreplace) %{_sysconfdir}/my.cnf.d/enable_encryption.preset
 %config(noreplace) %{_sysconfdir}/my.cnf.d/spider.cnf
 
+%config(noreplace) %{_sysconfdir}/my.cnf.d/provider_lz4.cnf
+#%config(noreplace) %{_sysconfdir}/my.cnf.d/provider_lzma.cnf
+
 %{_sbindir}/mysqld
 %{_sbindir}/mariadbd
 %{_libexecdir}/{mysqld,mariadbd}
@@ -1653,6 +1660,9 @@ fi
 %endif
 
 %changelog
+* Mon Dec 18 2023 Michal Schorm <mschorm@redhat.com> - 3:10.7.8-1
+- Rebase to 10.7.8
+
 * Mon Dec 18 2023 Michal Schorm <mschorm@redhat.com> - 3:10.6.16-1
 - Rebase to 10.6.16
 
diff --git a/sources b/sources
index afe73f7..a3358d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mariadb-10.6.16.tar.gz) = 05d509d5f7a672b897f42674884df0debcae0b75c4eaa6d67645343c596c81c0c41d474a59150108428bf9f2c4468ca05650afb616aac5d1ea09fd2cea258a7f
+SHA512 (mariadb-10.7.8.tar.gz) = 41b26d1b55c5bb1613780f9ddff202b6d07b677f67ee9d6318e10ba9bdd5e0eb70deb274962c6b7ec16edcf76db3c7970d163e97a51500eaeac7359e42a63ec6