From c00bd6372d18b977e39feea4b8274b33bff25d17 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Jun 05 2020 07:55:58 +0000
Subject: Merge branch 'master' into mariadb-10.5


---

diff --git a/galera.spec b/galera.spec
index d784f72..6675d08 100644
--- a/galera.spec
+++ b/galera.spec
@@ -37,12 +37,6 @@ replication engine see http://www.codership.com.
 %build
 %{set_build_flags}
 
-# FTBFS with the GLIBCXX_ASSERTIONS; #1546787
-CPPFLAGS=`echo $CPPFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" `
-CFLAGS=`echo $CFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" `
-CXXFLAGS=`echo $CXXFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" `
-export CPPFLAGS CFLAGS CXXFLAGS
-
 # Print help:
 #   scons-3 --help
 #   scons-3 -H
@@ -98,8 +92,12 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE
 
 
 %changelog
-* Tue Feb 25 2020 Michal Schorm <mschorm@redhat.com> - 26.4.4-1
+* Fri Jun 05 2020 Michal Schorm <mschorm@redhat.com> - 26.4.4-1
 - Rebase to 26.4.4
+  Resolves: rhbz#1546787
+
+* Thu May 28 2020 Jonathan Wakely <jwakely@redhat.com> - 26.4.3-4
+- Rebuilt for Boost 1.73
 
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 26.4.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/sources b/sources
index 760067c..d9a53c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (galera-26.4.4.tar.gz) = 0ba3cd06b24e19a4f426ab8cdf11b85ea3fba7358455aec2cbac27c77d9a7488bf1a0cfe8833c0db09573e27f051ab3e068b7733a0cbd4898469f3228a769e80
+SHA512 (galera-26.4.4.tar.gz) = 4e85b7e5182a04983d1b6f2ea539bb2fc5e02b73502bcaa1c142e92cd3e43d283570301a433518206885b575932ad5d4d9f72243ed94f6c7245036f24c699d8f