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

Rebase to 26.4.11

Browse Source 
--

Related: #2092371 #2092370
This commit is contained in:
Michal Schorm 2022-02-24 01:43:54 +01:00
parent 49c275a558
commit bf27698d4d
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmake_paths.patch
View File

@ -1,8 +1,8 @@
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 +13,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 +83,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})
+ +

7
galera.spec
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
@ -147,6 +147,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)

2
sources
View File

@ -1 +1 @@
SHA512 (galera-26.4.9.tar.gz) = a67f89e71d4635a634a6a4eb138a4a3fd6a8f1444dd0ba7bd46a2c1342e815da2ebd1df56a111cddf4470ad51a5b0a8e2153357c6066d8ba99aa3aec8761a857 SHA512 (galera-26.4.11.tar.gz) = 7f8f6c6633ca3cc782ec5e874303bf9e5343bffb0da5bbda50417750a1d22b4540bfaa2339a75c506214b7aa5ecc253fa4888c2e8e532751d4e904ca50001ecf