rpms/galera
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to 26.4.26

Browse Source 
Removed the no longer needed patches since they are present in the
source tarball

The upstream has renamed some of the cmake variables for consistency but
they do the same as the ones we used in the patch.

The removal of the cmake_paths patch also removed the rename of garb.cnf
to garb but there is no need to keep a patch for a rename of a single
file so I moved it to the %install section

Upstream release notes:
https://github.com/mariadb-corporation/mariadb-docs/blob/main/release-notes/galera-cluster/26.4/26.4.6.md

Related: RHEL-140364
This commit is contained in:
Pavol Sloboda 2026-05-25 13:38:18 +02:00
parent 2bcc957298
commit 5ccc24455d
4 changed files with 9 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
cmake_paths.patch
View File

@ -1,119 +0,0 @@
This patch has been offered upstream with slight typo fixes:
https://github.com/codership/galera/pull/614
on 21/02/2022
#----------------------
1) Documentation files
--- galera-26.4.11/CMakeLists.txt 2022-02-20 03:35:32.039968825 +0100
+++ galera-26.4.11/CMakeLists.txt_patched 2022-02-20 03:34:57.710641631 +0100
@@ -109,14 +109,19 @@ add_subdirectory(galera)
add_subdirectory(scripts/packages)
add_subdirectory(wsrep/tests)
+# Make the intall destination for documentation files configurable
+if(NOT DEFINED INSTALL_DOCDIR)
+ set(INSTALL_DOCDIR "doc" CACHE STRING "path to install documentaion to")
+endif()
+
if (NOT ${CMAKE_SYSTEM_NAME} MATCHES ".*BSD")
install(FILES
${PROJECT_SOURCE_DIR}/AUTHORS
${PROJECT_SOURCE_DIR}/COPYING
${PROJECT_SOURCE_DIR}/README
- DESTINATION doc)
+ DESTINATION ${INSTALL_DOCDIR} )
install(FILES ${PROJECT_SOURCE_DIR}/asio/LICENSE_1_0.txt
- DESTINATION doc
+ DESTINATION ${INSTALL_DOCDIR}
RENAME LICENSE.asio)
endif()
2) Configuration file
3) Executable files
4) Systemd service file
--- 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_LIBRARY})
-install(TARGETS garbd DESTINATION bin)
+# Make the install destination for garbd binary configurable
+if(NOT DEFINED INSTALL_GARBD)
+ set(INSTALL_GARBD "bin" CACHE STRING "path to install garbd binary to")
+endif()
+
+install(TARGETS garbd
+ DESTINATION ${INSTALL_GARBD})
+
if (NOT ${CMAKE_SYSTEM_NAME} MATCHES ".*BSD")
+
+ # Make the install destination for garbd-systemd wrapper script configurable
+ if(NOT DEFINED INSTALL_GARBD-SYSTEMD)
+ set(INSTALL_GARBD-SYSTEMD "share" CACHE STRING "path to install garbd-systemd wrapper script to")
+ endif()
+
+ install(FILES
+ ${CMAKE_CURRENT_SOURCE_DIR}/files/garb-systemd
+ DESTINATION ${INSTALL_GARBD-SYSTEMD})
+
+ # Make the install destination for garbd configuration file configurable
+ if(NOT DEFINED INSTALL_CONFIGURATION)
+ set(INSTALL_CONFIGURATION "share" CACHE STRING "path to install garbd configuration to")
+ endif()
+
install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/files/garb.cnf
+ DESTINATION ${INSTALL_CONFIGURATION}
+ RENAME garb)
+
+ # Make the install destination for garbd systemd service file configurable
+ if(NOT DEFINED INSTALL_SYSTEMD_SERVICE)
+ set(INSTALL_SYSTEMD_SERVICE "share" CACHE STRING "path to install garbd Systemd service to")
+ endif()
+
+ install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/files/garb.service
- ${CMAKE_CURRENT_SOURCE_DIR}/files/garb-systemd
- DESTINATION share)
+ DESTINATION ${INSTALL_SYSTEMD_SERVICE})
+
+ # Make the install destination for manpage configurable
+ if(NOT DEFINED INSTALL_MANPAGE)
+ set(INSTALL_MANPAGE "man/man8" CACHE STRING "path to install manpage to")
+ endif()
+
install(FILES
${PROJECT_SOURCE_DIR}/man/garbd.8
- DESTINATION man/man8)
+ DESTINATION ${INSTALL_MANPAGE})
+
endif()
5) Shared library path
--- galera-26.4.8/galera/src/CMakeLists.txt 2021-06-10 03:13:05.465005845 +0200
+++ galera-26.4.8/galera/src/CMakeLists.txt_patched 2021-06-10 03:16:53.388699046 +0200
@@ -112,7 +112,12 @@ endif()
target_link_libraries(galera_smm galera ${GALERA_LINK_OPTIONS})
-install(TARGETS galera_smm DESTINATION lib)
+# Make the install destination for garbd binary configurable
+if(NOT DEFINED INSTALL_LIBDIR)
+ set(INSTALL_LIBDIR "lib" CACHE STRING "path to install shared libraries to")
+endif()
+
+install(TARGETS galera_smm DESTINATION ${INSTALL_LIBDIR})
# The following checks are guaranteed to work only
# Linux platform, we skip them on others.

25
docs.patch
View File

@ -1,25 +0,0 @@
The CMake prepares file AUTHORS for packing.
It only contains one line, and isn't packed in any upstream-produced packagess.
I don't find it useful and since upstream doesn't pack it either, stop packing it here.
The README file contains infromation on how to build the project from sources, and thus isn't useful for the end users.
On the other hand, the README-MySQL isn't prepared for packing by CMake, but contains useful information about the software usage and it is package in upstream-produced packages.
Offered upstream:
https://github.com/codership/galera/pull/666
https://groups.google.com/g/codership-team/c/Cn4UO3MkNQs
--- galera-26.4.18/CMakeLists.txt 2024-06-09 04:54:56.281408893 +0200
+++ galera-26.4.18/CMakeLists.txt_patched 2024-06-09 06:52:58.093217968 +0200
@@ -118,9 +118,8 @@ endif()
if (NOT ${CMAKE_SYSTEM_NAME} MATCHES ".*BSD")
install(FILES
- ${PROJECT_SOURCE_DIR}/AUTHORS
${PROJECT_SOURCE_DIR}/COPYING
- ${PROJECT_SOURCE_DIR}/README
+ ${PROJECT_SOURCE_DIR}/scripts/packages/README-MySQL
DESTINATION ${INSTALL_DOCDIR} )
install(FILES ${PROJECT_SOURCE_DIR}/asio/LICENSE_1_0.txt
DESTINATION ${INSTALL_DOCDIR}

17
galera.spec
View File

@ -2,7 +2,7 @@
ExcludeArch: %{ix86}
Name: galera
Version: 26.4.25
Version: 26.4.26
Release: 1%{?dist}
Summary: Synchronous multi-master wsrep provider (replication engine)
@ -15,9 +15,6 @@ URL: http://galeracluster.com/
Source0: http://releases.galeracluster.com/source/%{name}-%{version}.tar.gz
Patch0: cmake_paths.patch
Patch1: docs.patch
BuildRequires: boost-devel check-devel openssl-devel cmake systemd gcc-c++ asio-devel
Requires: nmap-ncat
Requires: procps-ng
@ -34,8 +31,6 @@ description of Galera replication engine see https://www.galeracluster.com web.
%prep
%setup -q
%patch -P0 -p1
%patch -P1 -p1
# Create a sysusers.d config file
cat >galera.sysusers.conf <<EOF
@ -53,9 +48,9 @@ EOF
\
-DINSTALL_DOCDIR="share/doc/%{name}/" \
-DINSTALL_GARBD="sbin" \
-DINSTALL_GARBD-SYSTEMD="sbin" \
-DINSTALL_CONFIGURATION="/etc/sysconfig/" \
-DINSTALL_SYSTEMD_SERVICE="lib/systemd/system" \
-DINSTALL_GARBD_SYSTEMD="sbin" \
-DINSTALL_GARBD_CONFIGURATION="/etc/sysconfig/" \
-DINSTALL_GARBD_SERVICE="lib/systemd/system" \
-DINSTALL_LIBDIR="%{_lib}/galera" \
-DINSTALL_MANPAGE="share/man/man8"
@ -113,6 +108,7 @@ sed -i 's/User=nobody/User=garb/g' %{buildroot}%{_unitdir}/garbd.service
install -m0644 -D galera.sysusers.conf %{buildroot}%{_sysusersdir}/galera.conf
mv %{buildroot}%{_sysconfdir}/sysconfig/garb.cnf %{buildroot}%{_sysconfdir}/sysconfig/garb
%check
%ctest
@ -159,6 +155,9 @@ unlink /etc/systemd/system/garb.service || :
%changelog
* Mon May 25 2026 Pavol Sloboda <psloboda@redhat.com> - 26.4.26-1
- Rebased to 26.4.26
* Sun Feb 08 2026 Michal Schorm <mschorm@redhat.com> - 26.4.25-1
- Rebased to 26.4.25

2
sources
View File

@ -1 +1 @@
SHA512 (galera-26.4.25.tar.gz) = 40f320be461e1588ff2e50aee1912e1d9544b5d3ec95d3603c391a76abeaa54f3d7e3b975d0269370664e04935674a3a06823e3e7ee9ea9eb9a4879db97a3a61
SHA512 (galera-26.4.26.tar.gz) = 6cca23da2a449f9a8e2ced963559abe0aab79cdeebee475478c0e18d5ad1ddfc184367d518cad555998921bb67bcf9494fa30ae9fff6ce4b2b251668672483e7