Accepting request 1306455 from server:database

- libboost_system was removed upstream, fixes boo#1249900 * Patch galera-boost.patch OBS-URL: https://build.opensuse.org/request/show/1306455 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/galera-4?expand=0&rev=14
* Patch galera-boost.patch
2025-09-23 14:05:57 +00:00 · 2025-09-22 09:26:58 +00:00 · 2025-09-22 09:21:57 +00:00
3 changed files with 24 additions and 1 deletions
--- a/galera-4.changes
+++ b/galera-4.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Sep 20 11:45:20 UTC 2025 - Arjen de Korte <suse+build@de-korte.org>
+
+- libboost_system was removed upstream, fixes boo#1249900
+  * Patch galera-boost.patch
+
 -------------------------------------------------------------------
 Mon Jun  9 13:17:58 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>

--- a/galera-4.spec
+++ b/galera-4.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package galera-4
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -34,6 +34,9 @@ URL:            https://galeracluster.com/
 Source:         galera-%{version}.tar.xz
 Source2:        garb-user.conf
 Patch0:         galera-3-25.3.10_fix_startup_scripts.patch
+%if 0%{?suse_version} >= 1600
+Patch1:         galera-boost.patch
+%endif
 Patch2:         fix-cmake-install.patch
 BuildRequires:  boost-devel
 BuildRequires:  check-devel
@@ -50,8 +53,10 @@ Conflicts:      galera-3
 %if 0%{?suse_version} >= 1500
 BuildRequires:  libboost_filesystem-devel
 BuildRequires:  libboost_program_options-devel
+%if 0%{?suse_version} < 1600
 BuildRequires:  libboost_system-devel
 %endif
+%endif
 BuildRequires:  cmake
 # for fileownership of galeradir
 %if %{with split_package}
--- a/galera-boost.patch
+++ b/galera-boost.patch
@@ -0,0 +1,12 @@
+diff -purN a/cmake/boost.cmake b/cmake/boost.cmake
+--- a/cmake/boost.cmake	2025-03-27 19:26:19.000000000 +0100
+++ b/cmake/boost.cmake	2025-09-20 13:29:49.802302973 +0200
+@@ -4,7 +4,7 @@
+ 
+ set(Boost_USE_MULTITHREAD ON)
+ set(Boost_USE_STATIC_LIBS ${GALERA_STATIC})
+-find_package(Boost 1.41 COMPONENTS filesystem program_options system)
+find_package(Boost 1.41 COMPONENTS filesystem program_options)
+ if (NOT Boost_FOUND)
+   if (Boost_USE_STATIC_LIBS)
+     message(ERROR