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

Rebase to 10.11.10

Browse Source
This commit is contained in:
Michal Schorm 2024-11-16 18:21:08 +01:00
parent a1c05131a6
commit dc47e4af4d
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mariadb-libfmt.patch
View File

@ -18,14 +18,14 @@ 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. 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. We pre-download the sources archive and supply the CMake with it, instead of the web URL.
--- mariadb-10.11.7/cmake/libfmt.cmake 2024-02-01 18:44:35.000000000 +0100 --- mariadb-10.11.10/cmake/libfmt.cmake 2024-10-29 15:32:31.000000000 +0100
+++ mariadb-10.11.7/cmake/libfmt.cmake_patched 2024-06-06 23:27:10.770987424 +0200 +++ mariadb-10.11.10/cmake/libfmt.cmake_patched 2024-11-14 12:06:35.961435488 +0100
@@ -15,7 +15,7 @@ MACRO(BUNDLE_LIBFMT) @@ -15,7 +15,7 @@ MACRO(BUNDLE_LIBFMT)
ExternalProject_Add( ExternalProject_Add(
libfmt libfmt
PREFIX "${dir}" PREFIX "${dir}"
- URL "https://github.com/fmtlib/fmt/releases/download/11.0.1/fmt-11.0.1.zip" - URL "https://github.com/fmtlib/fmt/releases/download/11.0.2/fmt-11.0.2.zip"
+ URL "file:///${dir}/fmt-11.0.1.zip" + URL "file:///${dir}/fmt-11.0.2.zip"
URL_MD5 5f3915e2eff60e7f70c558120592100d URL_MD5 c622dca45ec3fc95254c48370a9f7a1d
INSTALL_COMMAND "" INSTALL_COMMAND ""
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""

7
mariadb.spec
View File

@ -119,7 +119,7 @@ ExcludeArch: %{ix86}
# See mariadb-libfmt.patch for detailed description. # See mariadb-libfmt.patch for detailed description.
%bcond_without bundled_fmt %bcond_without bundled_fmt
%if %{with bundled_fmt} %if %{with bundled_fmt}
%global fmt_bundled_version 11.0.1 %global fmt_bundled_version 11.0.2
%endif %endif
# Use main python interpretter version # Use main python interpretter version
@ -157,7 +157,7 @@ ExcludeArch: %{ix86}
%global sameevr %{epoch}:%{version}-%{release} %global sameevr %{epoch}:%{version}-%{release}
Name: mariadb Name: mariadb
Version: 10.11.9 Version: 10.11.10
Release: 1%{?with_debug:.debug}%{?dist} Release: 1%{?with_debug:.debug}%{?dist}
Epoch: 3 Epoch: 3
@ -1677,6 +1677,9 @@ fi
%endif %endif
%changelog %changelog
* Sat Nov 16 2024 Michal Schorm <mschorm@redhat.com> - 3:10.11.10-1
- Rebase to 10.11.10
* Tue Aug 13 2024 Michal Schorm <mschorm@redhat.com> - 3:10.11.9-1 * Tue Aug 13 2024 Michal Schorm <mschorm@redhat.com> - 3:10.11.9-1
- Rebase to 10.11.9 - Rebase to 10.11.9

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (mariadb-10.11.9.tar.gz) = a51680babed106ad52a8a9d57fb1db82fca02fd3eff7ef3f2cc3dd89bd9608e9f78ca5a11335a6be8d22950ca8caf1e859bd19550ab3fe129b73b856674cfdc0 SHA512 (mariadb-10.11.10.tar.gz) = 3a8655384813ba515ce185e8a03427785fbea75b3226e2a1db02839dd66c22622ba27eeb2ca7b3d840bba43720a4393bbf71eb4b2b9e41ab837629e89a8b5976
SHA512 (fmt-11.0.1.zip) = 77aa8371f1cb7f4bbac694fab7612bfba646c9ea784b18f5bfcf84187222e57f60c92f62c30096b9d6d2733790ff0f6ec55d7c024cbbbb3d0c51d9511cc67c19 SHA512 (fmt-11.0.2.zip) = 06eba9a2a8d1c2269801e10a00ed26a9344b79bca0391a6b10f35e9716682f8345125fceb96e9ca36ffbd4c0558b0e63e4c45a9dff09a8ee186458ec68e34198