diff --git a/.gitignore b/.gitignore index ee20991..7438c35 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/galera-26.4.9.tar.gz +SOURCES/galera-26.4.11.tar.gz diff --git a/.rh-mariadb105-galera.metadata b/.rh-mariadb105-galera.metadata index 26b3560..f891e65 100644 --- a/.rh-mariadb105-galera.metadata +++ b/.rh-mariadb105-galera.metadata @@ -1 +1 @@ -3c9925963811319563163a5364c36871ca25c556 SOURCES/galera-26.4.9.tar.gz +ac267effbdbaf0da4245769009f038a5a922d121 SOURCES/galera-26.4.11.tar.gz diff --git a/SOURCES/cmake_paths.patch b/SOURCES/cmake_paths.patch index e341b09..ec4f06a 100644 --- a/SOURCES/cmake_paths.patch +++ b/SOURCES/cmake_paths.patch @@ -1,8 +1,15 @@ +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.8/CMakeLists.txt 2021-04-08 08:05:44.000000000 +0200 -+++ galera-26.4.8/CMakeLists.txt_patched 2021-06-10 01:40:26.886770832 +0200 -@@ -106,14 +106,19 @@ add_subdirectory(galera) +--- 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) @@ -13,12 +20,12 @@ + if (NOT ${CMAKE_SYSTEM_NAME} MATCHES ".*BSD") install(FILES - ${CMAKE_SOURCE_DIR}/AUTHORS - ${CMAKE_SOURCE_DIR}/COPYING - ${CMAKE_SOURCE_DIR}/README + ${PROJECT_SOURCE_DIR}/AUTHORS + ${PROJECT_SOURCE_DIR}/COPYING + ${PROJECT_SOURCE_DIR}/README - DESTINATION doc) + DESTINATION ${INSTALL_DOCDIR} ) - install(FILES ${CMAKE_SOURCE_DIR}/asio/LICENSE_1_0.txt + install(FILES ${PROJECT_SOURCE_DIR}/asio/LICENSE_1_0.txt - DESTINATION doc + DESTINATION ${INSTALL_DOCDIR} RENAME LICENSE.asio) @@ -83,7 +90,7 @@ + endif() + install(FILES - ${CMAKE_SOURCE_DIR}/man/garbd.8 + ${PROJECT_SOURCE_DIR}/man/garbd.8 - DESTINATION man/man8) + DESTINATION ${INSTALL_MANPAGE}) + diff --git a/SPECS/galera.spec b/SPECS/galera.spec index 76d4bc5..4018769 100644 --- a/SPECS/galera.spec +++ b/SPECS/galera.spec @@ -17,8 +17,8 @@ %global daemon_name %{?scl_prefix}garbd Name: %{?scl_prefix}galera -Version: 26.4.9 -Release: 3%{?dist} +Version: 26.4.11 +Release: 1%{?dist} Summary: Synchronous multi-master wsrep provider (replication engine) License: GPLv2 @@ -41,10 +41,10 @@ Requires: procps-ng %{?systemd_requires} %description -Galera is a fast synchronous multi-master wsrep provider (replication engine) +Galera is a fast synchronous multimaster wsrep provider (replication engine) for transactional databases and similar applications. For more information -about wsrep API see http://launchpad.net/wsrep. For a description of Galera -replication engine see http://www.codership.com. +about wsrep API see https://github.com/codership/wsrep-API repository. For a +description of Galera replication engine see https://www.galeracluster.com web. %prep %setup -q -n %{pkg_name}-%{version} @@ -186,6 +186,9 @@ fi #%doc %{_docdir}/galera/README-MySQL %changelog +* Sun Feb 20 2022 Michal Schorm - 26.4.11-1 +- Rebase to 26.4.11 + * Wed Jan 19 2022 Lukas Javorsky - 26.4.9-3 - Explicitly require the 'procps-ng' package - Otherwise it will not require it in the lightweight systems (e.g. containers)