diff --git a/.galera.metadata b/.galera.metadata index 4e37e95..99af887 100644 --- a/.galera.metadata +++ b/.galera.metadata @@ -1 +1 @@ -ed55d57a704512140b3979d94b6ff0691c0a6227 SOURCES/galera-26.4.20.tar.gz +4b56a3bbf87f0ab2e7d22447a7dbb4c4ad443c6f SOURCES/galera-26.4.23.tar.gz diff --git a/.gitignore b/.gitignore index f3036d5..e0f68da 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/galera-26.4.20.tar.gz +SOURCES/galera-26.4.23.tar.gz diff --git a/SOURCES/cmake_paths.patch b/SOURCES/cmake_paths.patch index ec4f06a..27d5643 100644 --- a/SOURCES/cmake_paths.patch +++ b/SOURCES/cmake_paths.patch @@ -37,11 +37,11 @@ on 21/02/2022 3) Executable files 4) Systemd service file ---- galera-26.4.8/garb/CMakeLists.txt 2021-06-10 03:54:55.482520883 +0200 -+++ galera-26.4.8/garb/CMakeLists.txt_patched 2021-06-10 03:54:41.070274710 +0200 -@@ -31,14 +31,51 @@ target_compile_options(garbd +--- galera-26.4.23/garb/CMakeLists.txt 2025-07-15 07:34:42.000000000 +0200 ++++ galera-26.4.23/garb/CMakeLists.txt_patched 2025-08-08 15:22:15.492953438 +0200 +@@ -35,14 +35,51 @@ target_compile_options(garbd target_link_libraries(garbd gcs4garb gcomm gcache - ${Boost_PROGRAM_OPTIONS_LIBRARIES}) + ${Boost_PROGRAM_OPTIONS_LIBRARY}) -install(TARGETS garbd DESTINATION bin) +# Make the install destination for garbd binary configurable diff --git a/SPECS/galera.spec b/SPECS/galera.spec index 69ad582..2197c57 100644 --- a/SPECS/galera.spec +++ b/SPECS/galera.spec @@ -1,8 +1,8 @@ -# To both save infrastrucutre resources and workaround for i686 FTBFS +# To both save infrastructure resources and workaround for i686 FTBFS ExcludeArch: %{ix86} Name: galera -Version: 26.4.20 +Version: 26.4.23 Release: 1%{?dist} Summary: Synchronous multi-master wsrep provider (replication engine) @@ -42,9 +42,8 @@ description of Galera replication engine see https://www.galeracluster.com web. %patch -P1 -p1 %build -%{set_build_flags} -%cmake . \ +%cmake \ -DCMAKE_BUILD_TYPE="%{?with_debug:Debug}%{!?with_debug:RelWithDebInfo}" \ -DINSTALL_LAYOUT=RPM \ -DCMAKE_RULE_MESSAGES:BOOL=OFF \ @@ -59,7 +58,7 @@ description of Galera replication engine see https://www.galeracluster.com web. -DINSTALL_LIBDIR="%{_lib}/galera" \ -DINSTALL_MANPAGE="share/man/man8" -cmake -B %_vpath_builddir -LAH +cmake -B %_vpath_builddir -N -LAH %cmake_build @@ -161,8 +160,14 @@ install -D -m 755 %{SOURCE2} %{buildroot}%{_sbindir}/garbd-wrapper %changelog -* Thu Nov 14 2024 Michal Schorm - 26.4.20-1 -- Rebase to 26.4.20 +* Fri Aug 08 2025 Michal Schorm - 26.4.23-1 +- Rebase to 26.4.23 + +* Wed Jul 30 2025 Michal Schorm - 26.4.22-1 +- Rebase to 26.4.22 + +* Wed Feb 05 2025 Michal Schorm - 26.4.21-1 +- Rebase to 26.4.21 * Fri Oct 18 2024 Michal Schorm - 26.4.19-1 - Rebase to 26.4.19