From b0d82771cf58ebd2a75bcd09a1ec47125e7044e2 Mon Sep 17 00:00:00 2001 From: Pavol Sloboda Date: Thu, 26 Jun 2025 16:38:43 +0200 Subject: [PATCH] Stopped bundling the fmt library with the package as the fmt library we have on fedora 43, 42 and 41 is compatible with mariadb at the moment, therefore the mariadb-libfmt.patch is no longer needed as we can just use the system fmt package. I have kept the infrastructure as it needs to be used on rhel as rhel8 and rhel9 dont' have an fmt package and rhel10s version is too old to be used with this version of mariadb. --- mariadb-libfmt.patch | 5 +++++ mariadb11.8.spec | 9 ++++++++- sources | 1 - 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/mariadb-libfmt.patch b/mariadb-libfmt.patch index 62a181f..e96ab8f 100644 --- a/mariadb-libfmt.patch +++ b/mariadb-libfmt.patch @@ -18,6 +18,11 @@ To avoid potential issues on systems with FMT library between 8.0 and the one wi introduce a bundling mechanism for use on such distributions. We pre-download the sources archive and supply the CMake with it, instead of the web URL. +This patch is not used at the moment as the current version of the fmt package available in f40-f43 is sufficient +therefore we are using it instead of the bundled fmt. + +We are still keeping this patch in case it may be needed in the future and because it is needed in rhel + --- mariadb-11.8.2/cmake/libfmt.cmake 2025-05-21 16:08:31.000000000 +0200 +++ mariadb-11.8.2/cmake/libfmt.cmake_patched 2025-06-16 22:51:14.579292098 +0200 @@ -15,7 +15,7 @@ MACRO(BUNDLE_LIBFMT) diff --git a/mariadb11.8.spec b/mariadb11.8.spec index 6f5567f..a966141 100644 --- a/mariadb11.8.spec +++ b/mariadb11.8.spec @@ -124,7 +124,14 @@ # To avoid issues with a breaking change in FMT library, bundle it on systems where FMT wasn't fixed yet # See mariadb-libfmt.patch for detailed description. +# As the breaking issues are no longer present in fedora 41 +# and higher, this issue only remains in rhel +%if 0%{?rhel} %bcond bundled_fmt 1 +%else +%bcond bundled_fmt 0 +%endif + %if %{with bundled_fmt} %global fmt_bundled_version 11.1.4 %endif @@ -317,7 +324,7 @@ BuildRequires: perl(warnings) # for running some openssl tests rhbz#1189180 BuildRequires: openssl openssl-devel -%{!?with_bundled_fmt:BuildRequires: fmt-devel >= 10.2.1-4} +%{!?with_bundled_fmt:BuildRequires: fmt-devel >= 11.1.4-1} Requires: bash coreutils grep diff --git a/sources b/sources index ae02a46..e493d4c 100755 --- a/sources +++ b/sources @@ -1,2 +1 @@ SHA512 (mariadb-11.8.2.tar.gz) = f915194e62633cc7c8b2fa901d83b30bdf6e3b8051c2d7e39dcae0a819787cc1f54dd92fdf692c9100ffbdc66b57e265bcc0433fcc2a80324b8dac16653de41e -SHA512 (fmt-11.1.4.zip) = 8269e76157c531f2c08295ca499d2a64e91c39ffbeed5d726d9aba92bf3d55a7d0e2cd05adbd7d2ccd2dee8a819037f48feb962824cb4c7959c8345795b404aa