Rebase to 10.7.8

This commit is contained in:
Michal Schorm 2023-07-04 11:39:01 +02:00
parent 1bbc56a6d8
commit 6f8e29f6c6
2 changed files with 12 additions and 2 deletions

View File

@ -130,7 +130,7 @@
%global sameevr %{epoch}:%{version}-%{release}
Name: mariadb
Version: 10.6.16
Version: 10.7.8
Release: 1%{?with_debug:.debug}%{?dist}
Epoch: 3
@ -256,6 +256,8 @@ BuildRequires: perl(warnings)
# for running some openssl tests rhbz#1189180
BuildRequires: openssl openssl-devel
BuildRequires: fmt-devel
Requires: bash coreutils grep
Requires: %{name}-common = %{sameevr}
@ -788,6 +790,7 @@ fi
-DCONC_WITH_SSL=%{?with_clibrary:ON}%{!?with_clibrary:NO} \
-DWITH_SSL=system \
-DWITH_ZLIB=system \
-DWITH_LIBFMT=system \
-DLZ4_LIBS=%{?with_lz4:/usr/%{_lib}/liblz4.so}%{!?with_lz4:} \
-DWITH_INNODB_LZ4=%{?with_lz4:ON}%{!?with_lz4:OFF} \
-DWITH_ROCKSDB_LZ4=%{?with_lz4:ON}%{!?with_lz4:OFF} \
@ -806,6 +809,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
@ -1372,6 +1376,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}
@ -1604,6 +1611,9 @@ fi
%endif
%changelog
* Thu Jan 25 2024 Michal Schorm <mschorm@redhat.com> - 3:10.7.8-1
- Rebase to 10.7.8
* Thu Jan 25 2024 Michal Schorm <mschorm@redhat.com> - 3:10.6.16-1
- Rebase to 10.6.16

View File

@ -1 +1 @@
SHA512 (mariadb-10.6.16.tar.gz) = 05d509d5f7a672b897f42674884df0debcae0b75c4eaa6d67645343c596c81c0c41d474a59150108428bf9f2c4468ca05650afb616aac5d1ea09fd2cea258a7f
SHA512 (mariadb-10.7.8.tar.gz) = 41b26d1b55c5bb1613780f9ddff202b6d07b677f67ee9d6318e10ba9bdd5e0eb70deb274962c6b7ec16edcf76db3c7970d163e97a51500eaeac7359e42a63ec6