Merge branch 'master' into mariadb-10.4

.gitignore

@@ -5,7 +5,7 @@
 /galera-25.3.22.tar.gz
 /galera-25.3.23.tar.gz
 /galera-25.3.25.tar.gz
-/galera-26.4.0.tar.gz
+/galera-25.3.26.tar.gz
-/galera-26.4.1.tar.gz
+/galera-25.3.28.tar.gz
-/galera-26.4.2.tar.gz
 /galera-26.4.3.tar.gz
+/galera-26.4.4.tar.gz

galera.spec

@@ -1,6 +1,6 @@
 Name:           galera
-Version:        26.4.3
+Version:        26.4.4
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Synchronous multi-master wsrep provider (replication engine)
 
 License:        GPLv2
@@ -22,6 +22,7 @@ Requires:       nmap-ncat
 
 %{?systemd_requires}
 
+
 %description
 Galera is a fast synchronous multi-master wsrep provider (replication engine)
 for transactional databases and similar applications. For more information
@@ -34,8 +35,19 @@ replication engine see http://www.codership.com.
 %patch0 -p1
 
 %build
-scons-3 %{?_smp_mflags} strict_build_flags=1
+%{set_build_flags}
 
+# Print help:
+#   scons-3 --help
+#   scons-3 -H
+
+# Possibly usefull arguments:
+#   --debug=findlibs
+#   --debug=stacktrace
+#   --warn=all
+#   debug=0
+
+scons-3 %{?_smp_mflags} strict_build_flags=1
 
 %install
 install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/garbd.service
@@ -80,22 +92,33 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE
 
 
 %changelog
-* Thu Dec 12 2019 Michal Schorm <mschorm@redhat.com> - 26.4.3-2
+* Fri Jun 05 2020 Michal Schorm <mschorm@redhat.com> - 26.4.4-1
-- Tweak systemd macro usage
+- Rebase to 26.4.4
-- Start building with GLIBCXX_ASSERTIONS again
+  Resolves: rhbz#1546787
-- Start building with strict_build_flags again
 
-* Tue Dec 03 2019 Michal Schorm <mschorm@redhat.com> - 26.4.3-1
+* 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
+
+* Sat Jan 18 2020 Michal Schorm <mschorm@redhat.com> - 26.4.3-2
 - Rebase to 26.4.3
 
-* Tue Jun 04 2019 Michal Schorm <mschorm@redhat.com> - 26.4.2-1
+* Wed Nov 06 2019 Michal Schorm <mschorm@redhat.com> - 25.3.28-1
-- Rebase to 26.4.2
+- Rebase to 25.3.28
 
-* Wed Mar 13 2019 Michal Schorm <mschorm@redhat.com> - 26.4.1-1
+* Thu Aug 01 2019 Michal Schorm <mschorm@redhat.com> - 25.3.26-3
-- Rebase to 26.4.1
+- Fix for #1735233 and #1737108
 
-* Wed Mar 13 2019 Michal Schorm <mschorm@redhat.com> - 26.4.0-1
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 25.3.26-2
-- Rebase to 26.4.0
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Jul 19 2019 Michal Schorm <mschorm@redhat.com> - 25.3.26-1
+- Rebase to 25.3.26
+
+* Fri Jul 19 2019 Michal Schorm <mschorm@redhat.com> - 25.3.25-4
+- Use macro for setting up the compiler flags
 
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 25.3.25-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

sources

@@ -1 +1 @@
-SHA512 (galera-26.4.3.tar.gz) = 857c6b1965871a5801d3cd7396fec8259e0b72a397b5fb92e63f374531fdb03dbecd5d5ebfdf2f0dc388d87c0ae25b357d02581c8d5889803d04c0a2f2583b52
+SHA512 (galera-26.4.4.tar.gz) = 4e85b7e5182a04983d1b6f2ea539bb2fc5e02b73502bcaa1c142e92cd3e43d283570301a433518206885b575932ad5d4d9f72243ed94f6c7245036f24c699d8f