From 8f0cee6357a42908d13c83217bf2cfd7f52c04db Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Fri, 8 Aug 2025 15:51:30 +0200 Subject: [PATCH] Rebase to 26.4.23 Support for building with CMake 4.0 was introduced by the upstream. Resolves: rhbz#2349255, rhbz#2380613 --- cmake_paths.patch | 8 ++++---- galera.spec | 5 ++++- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cmake_paths.patch b/cmake_paths.patch index ec4f06a..27d5643 100644 --- a/cmake_paths.patch +++ b/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/galera.spec b/galera.spec index 93d4f00..566ed64 100644 --- a/galera.spec +++ b/galera.spec @@ -2,7 +2,7 @@ ExcludeArch: %{ix86} Name: galera -Version: 26.4.22 +Version: 26.4.23 Release: 1%{?dist} Summary: Synchronous multi-master wsrep provider (replication engine) @@ -151,6 +151,9 @@ unlink /etc/systemd/system/garb.service || : %changelog +* 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 diff --git a/sources b/sources index 0879e84..cf68b18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (galera-26.4.22.tar.gz) = 6f518fa57b1f07995d480f35ecfa34ac1fd433aa45f5058281feed397774907673cc852560caf40fa1b259d4f63bf24772b79fccaa798680975a4bcacdd31e41 +SHA512 (galera-26.4.23.tar.gz) = ce0bbb849d6605ee7970ccf6f85cda9c37f08c1ba3f88ff94e3028a83e5fb6b2323dfd465f62a4c905b7d767bd29ff011f1196c74011f8caab45034e7e5fe894