diff --git a/.gitignore b/.gitignore index 337917f..2d6b39b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mariadb-10.5.27-downstream_modified.tar.gz +SOURCES/mariadb-10.5.29-downstream_modified.tar.gz diff --git a/.mariadb.metadata b/.mariadb.metadata index d95386a..94504df 100644 --- a/.mariadb.metadata +++ b/.mariadb.metadata @@ -1 +1 @@ -f791457e4617e33dc6c9a2097c05a7b20a1a7629 SOURCES/mariadb-10.5.27-downstream_modified.tar.gz +dd44fc0383e1b2c0730f7a894c8236c6285be33a SOURCES/mariadb-10.5.29-downstream_modified.tar.gz diff --git a/SOURCES/rh-skipped-tests-base.list b/SOURCES/rh-skipped-tests-base.list index 1e62ce4..8c4e384 100644 --- a/SOURCES/rh-skipped-tests-base.list +++ b/SOURCES/rh-skipped-tests-base.list @@ -95,3 +95,4 @@ mariabackup.slave_provision_nolock : # Fails on 10.5.27 main.timezone : +main.alter_table_combinations : diff --git a/SPECS/mariadb.spec b/SPECS/mariadb.spec index 8dbba91..5fe98f1 100644 --- a/SPECS/mariadb.spec +++ b/SPECS/mariadb.spec @@ -18,7 +18,7 @@ ExcludeArch: %{ix86} # 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.27 +%global last_tested_version 10.5.29 # Set to 1 to force run the testsuite even if it was already tested in current version %global force_run_testsuite 0 @@ -117,7 +117,7 @@ ExcludeArch: %{ix86} %bcond_without unbundled_pcre %else %bcond_with unbundled_pcre -%global pcre_bundled_version 10.44 +%global pcre_bundled_version 10.45 %endif # Use main python interpretter version @@ -155,8 +155,8 @@ ExcludeArch: %{ix86} %global sameevr %{epoch}:%{version}-%{release} Name: mariadb -Version: 10.5.27 -Release: 1%{?with_debug:.debug}%{?dist} +Version: 10.5.29 +Release: 2%{?with_debug:.debug}%{?dist} Epoch: 3 Summary: A very fast and robust SQL database server @@ -1635,6 +1635,12 @@ fi %endif %changelog +* Wed Oct 01 2025 Pavol Sloboda - 3:10.5.29-2 +- Release bump for rebuild + +* Mon Aug 25 2025 Pavol Sloboda - 3:10.5.29-1 +- Rebase to 10.5.29 + * Tue Dec 03 2024 Michal Schorm - 3:10.5.27-1 - Rebase to 10.5.27