Import from CS git

.galera.metadata

@@ -1 +1 @@
-bbdb2f8d77c45fd3cffc162660d48201bb5a318a SOURCES/galera-26.4.14.tar.gz
+ed55d57a704512140b3979d94b6ff0691c0a6227 SOURCES/galera-26.4.20.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/galera-26.4.14.tar.gz
+SOURCES/galera-26.4.20.tar.gz

SOURCES/docs.patch

@@ -0,0 +1,25 @@
+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}

SPECS/galera.spec

@@ -1,5 +1,8 @@
+# To both save infrastrucutre resources and workaround for i686 FTBFS
+ExcludeArch: %{ix86}
+
 Name:           galera
-Version:        26.4.14
+Version:        26.4.20
 Release:        1%{?dist}
 Summary:        Synchronous multi-master wsrep provider (replication engine)
 
@@ -16,6 +19,7 @@ Source1:        garbd.service
 Source2:        garbd-wrapper
 
 Patch0:         cmake_paths.patch
+Patch1:         docs.patch
 
 BuildRequires:  boost-devel check-devel openssl-devel cmake systemd gcc-c++ asio-devel
 Requires(pre):  /usr/sbin/useradd
@@ -34,7 +38,8 @@ description of Galera replication engine see https://www.galeracluster.com web.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch -P0 -p1
+%patch -P1 -p1
 
 %build
 %{set_build_flags}
@@ -103,6 +108,8 @@ sed -i 's;/usr/bin/garbd;/usr/sbin/garbd;g' %{buildroot}/usr/share/doc/galera/ga
 ##   specific to this service, either statically via systemd-sysusers or dynamically
 ##   via the DynamicUser= service setting.
 sed -i 's/User=nobody/User=garb/g' %{buildroot}/usr/share/doc/galera/garbd.service
+# Maintainers from other distributions also tries to resolve it on the upstream:
+#   https://github.com/codership/galera/pull/633
 
 # Install old service and wrapper to maintain compatibility
 install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/garbd.service
@@ -148,14 +155,24 @@ install -D -m 755 %{SOURCE2} %{buildroot}%{_sbindir}/garbd-wrapper
 
 %{_libdir}/galera/libgalera_smm.so
 
-%doc %{_docdir}/galera/AUTHORS
 %doc %{_docdir}/galera/COPYING
 %doc %{_docdir}/galera/LICENSE.asio
-%doc %{_docdir}/galera/README
+%doc %{_docdir}/galera/README-MySQL
-#%doc %{_docdir}/galera/README-MySQL
 
 
 %changelog
+* Thu Nov 14 2024 Michal Schorm <mschorm@redhat.com> - 26.4.20-1
+- Rebase to 26.4.20
+
+* Fri Oct 18 2024 Michal Schorm <mschorm@redhat.com> - 26.4.19-1
+- Rebase to 26.4.19
+
+* Fri Jun 07 2024 Michal Schorm <mschorm@redhat.com> - 26.4.18-1
+- Rebase to 26.4.18
+
+* Fri Nov 17 2023 Michal Schorm <mschorm@redhat.com> - 26.4.16-1
+- Rebase to 26.4.16
+
 * Sat Apr 29 2023 Michal Schorm <mschorm@redhat.com> - 26.4.14-1
 - Rebase to 26.4.14