diff --git a/galera-4-26.4.21.tar.gz b/galera-4-26.4.21.tar.gz deleted file mode 100644 index c278e4fb3c954e5fe2acd89dbdfa2c8d712283f3..0000000000000000000000000000000000000000 Binary files a/galera-4-26.4.21.tar.gz and /dev/null differ diff --git a/galera-4-26.4.22-port-to-newer-cmake.patch b/galera-4-26.4.22-port-to-newer-cmake.patch new file mode 100644 index 0000000000000000000000000000000000000000..d535ae970a6d5bf4104ce7632a2d7366db9aed95 --- /dev/null +++ b/galera-4-26.4.22-port-to-newer-cmake.patch @@ -0,0 +1,22 @@ +--- galera-4-26.4.22/CMakeLists.txt.orig 2025-03-03 22:54:35.500180400 +0800 ++++ galera-4-26.4.22/CMakeLists.txt 2025-03-03 22:54:47.843307700 +0800 +@@ -3,7 +3,7 @@ + # + + message(STATUS "CMake version ${CMAKE_VERSION}") +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 2.8...${CMAKE_VERSION}) + project(galera-4) + + include(CheckCCompilerFlag) +--- galera-4-26.4.22/garb/CMakeLists.txt.orig 2025-03-03 23:04:48.069136300 +0800 ++++ galera-4-26.4.22/garb/CMakeLists.txt 2025-03-03 23:05:37.453024700 +0800 +@@ -29,7 +29,7 @@ + ) + + target_link_libraries(garbd gcs4garb gcomm gcache +- ${Boost_PROGRAM_OPTIONS_LIBRARIES}) ++ ${Boost_LIBRARIES}) + + # Make the install destination for garbd binary configurable + if(NOT DEFINED INSTALL_GARBD) diff --git a/galera-4-26.4.22.tar.gz b/galera-4-26.4.22.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..5a801407f6759edabf0bc1c2542256dc36887c1f Binary files /dev/null and b/galera-4-26.4.22.tar.gz differ diff --git a/galera.spec b/galera.spec index 406bec263c4ae550b5d779b8842c2ee68d650297..b6f99cb31926011b0f09385a3e82a52fd64bf26a 100644 --- a/galera.spec +++ b/galera.spec @@ -1,15 +1,16 @@ Name: galera -Version: 26.4.21 +Version: 26.4.22 Release: 1 Summary: Synchronous multi-master replication library License: GPL-2.0-only -URL: http://galeracluster.com/ -Source0: http://releases.galeracluster.com/%{name}-4.21/source/%{name}-4-%{version}.tar.gz +URL: https://galeracluster.com/ +Source0: https://releases.galeracluster.com/%{name}-4.22/source/%{name}-4-%{version}.tar.gz Patch0: cmake_paths.patch Patch1: docs.patch Patch2: network.patch Patch3: fix-garb-service.patch +Patch4: galera-4-26.4.22-port-to-newer-cmake.patch BuildRequires: asio-devel boost-devel check-devel gcc-c++ openssl-devel cmake systemd Requires(pre): /usr/sbin/useradd @@ -25,8 +26,6 @@ This is Galera replication - Codership's implementation of the write set replica %autosetup -n %{name}-4-%{version} -p1 %build -%{set_build_flags} - %cmake \ -DCMAKE_BUILD_TYPE="%{?with_debug:Debug}%{!?with_debug:RelWithDebInfo}" \ -DINSTALL_LAYOUT=RPM \ @@ -55,14 +54,12 @@ mv %{buildroot}%{_unitdir}/garb.service %{buildroot}%{_unitdir}/garbd.service %ctest %post -/sbin/ldconfig %systemd_post garbd.service %preun %systemd_preun garbd.service %postun -/sbin/ldconfig %systemd_postun_with_restart garbd.service %files @@ -78,6 +75,9 @@ mv %{buildroot}%{_unitdir}/garb.service %{buildroot}%{_unitdir}/garbd.service %{_mandir}/man8/garbd.8* %changelog +* Mon Mar 03 2025 Funda Wang - 26.4.22-1 +- update to 26.4.22 + * Thu Jan 02 2025 wangkai <13474090681@163.com> - 26.4.21-1 - Upgrade to 26.4.21 - Switch scons build to cmake build