import galera-26.4.11-1.el9_0

This commit is contained in:
CentOS Sources 2022-09-27 09:21:03 -04:00 committed by Stepan Oksanichenko
parent ed60160462
commit 76c158cba8
4 changed files with 31 additions and 16 deletions

View File

@ -1 +1 @@
3c9925963811319563163a5364c36871ca25c556 SOURCES/galera-26.4.9.tar.gz ac267effbdbaf0da4245769009f038a5a922d121 SOURCES/galera-26.4.11.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/galera-26.4.9.tar.gz SOURCES/galera-26.4.11.tar.gz

View File

@ -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 1) Documentation files
--- galera-26.4.8/CMakeLists.txt 2021-04-08 08:05:44.000000000 +0200 --- galera-26.4.11/CMakeLists.txt 2022-02-20 03:35:32.039968825 +0100
+++ galera-26.4.8/CMakeLists.txt_patched 2021-06-10 01:40:26.886770832 +0200 +++ galera-26.4.11/CMakeLists.txt_patched 2022-02-20 03:34:57.710641631 +0100
@@ -106,14 +106,19 @@ add_subdirectory(galera) @@ -109,14 +109,19 @@ add_subdirectory(galera)
add_subdirectory(scripts/packages) add_subdirectory(scripts/packages)
add_subdirectory(wsrep/tests) add_subdirectory(wsrep/tests)
@ -13,12 +20,12 @@
+ +
if (NOT ${CMAKE_SYSTEM_NAME} MATCHES ".*BSD") if (NOT ${CMAKE_SYSTEM_NAME} MATCHES ".*BSD")
install(FILES install(FILES
${CMAKE_SOURCE_DIR}/AUTHORS ${PROJECT_SOURCE_DIR}/AUTHORS
${CMAKE_SOURCE_DIR}/COPYING ${PROJECT_SOURCE_DIR}/COPYING
${CMAKE_SOURCE_DIR}/README ${PROJECT_SOURCE_DIR}/README
- DESTINATION doc) - DESTINATION doc)
+ DESTINATION ${INSTALL_DOCDIR} ) + 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 doc
+ DESTINATION ${INSTALL_DOCDIR} + DESTINATION ${INSTALL_DOCDIR}
RENAME LICENSE.asio) RENAME LICENSE.asio)
@ -83,7 +90,7 @@
+ endif() + endif()
+ +
install(FILES install(FILES
${CMAKE_SOURCE_DIR}/man/garbd.8 ${PROJECT_SOURCE_DIR}/man/garbd.8
- DESTINATION man/man8) - DESTINATION man/man8)
+ DESTINATION ${INSTALL_MANPAGE}) + DESTINATION ${INSTALL_MANPAGE})
+ +

View File

@ -1,6 +1,6 @@
Name: galera Name: galera
Version: 26.4.9 Version: 26.4.11
Release: 2%{?dist} Release: 1%{?dist}
Summary: Synchronous multi-master wsrep provider (replication engine) Summary: Synchronous multi-master wsrep provider (replication engine)
License: GPLv2 License: GPLv2
@ -26,10 +26,10 @@ Requires: procps-ng
%description %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 for transactional databases and similar applications. For more information
about wsrep API see http://launchpad.net/wsrep. For a description of Galera about wsrep API see https://github.com/codership/wsrep-API repository. For a
replication engine see http://www.codership.com. description of Galera replication engine see https://www.galeracluster.com web.
%prep %prep
@ -40,7 +40,7 @@ replication engine see http://www.codership.com.
%{set_build_flags} %{set_build_flags}
%cmake . \ %cmake \
-DCMAKE_BUILD_TYPE="%{?with_debug:Debug}%{!?with_debug:RelWithDebInfo}" \ -DCMAKE_BUILD_TYPE="%{?with_debug:Debug}%{!?with_debug:RelWithDebInfo}" \
-DINSTALL_LAYOUT=RPM \ -DINSTALL_LAYOUT=RPM \
-DCMAKE_RULE_MESSAGES:BOOL=OFF \ -DCMAKE_RULE_MESSAGES:BOOL=OFF \
@ -105,6 +105,11 @@ sed -i 's;/usr/bin/garbd;/usr/sbin/garbd;g' %{buildroot}/usr/sbin/garb-systemd
## via the DynamicUser= service setting. ## via the DynamicUser= service setting.
sed -i 's/User=nobody/User=garb/g' %{buildroot}/usr/lib/systemd/system/garbd.service sed -i 's/User=nobody/User=garb/g' %{buildroot}/usr/lib/systemd/system/garbd.service
%check
%ctest
%pre %pre
/usr/sbin/useradd -M -r -d /dev/null -s /sbin/nologin -c "Galera Arbitrator Daemon" garb >/dev/null 2>&1 || : /usr/sbin/useradd -M -r -d /dev/null -s /sbin/nologin -c "Galera Arbitrator Daemon" garb >/dev/null 2>&1 || :
@ -147,6 +152,9 @@ sed -i 's/User=nobody/User=garb/g' %{buildroot}/usr/lib/systemd/system/garbd.ser
%changelog %changelog
* Sun Feb 20 2022 Michal Schorm <mschorm@redhat.com> - 26.4.11-1
- Rebase to 26.4.11
* Fri Nov 19 2021 Lukas Javorsky <ljavorsk@redhat.com> - 26.4.9-2 * Fri Nov 19 2021 Lukas Javorsky <ljavorsk@redhat.com> - 26.4.9-2
- Explicitly require the 'procps-ng' package - Explicitly require the 'procps-ng' package
- Otherwise it will not require it in the lightweight systems (e.g. containers) - Otherwise it will not require it in the lightweight systems (e.g. containers)