From 0877da02461014f3811ad6aa91ea46deddf2d0ff Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Nov 04 2020 15:05:16 +0000 Subject: Rebase to 26.4.6 --- diff --git a/.gitignore b/.gitignore index d25f64a..8b5f62d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /galera-26.4.3.tar.gz /galera-26.4.4.tar.gz /galera-26.4.5.tar.gz +/galera-26.4.6.tar.gz diff --git a/galera.spec b/galera.spec index 1fd562b..1657841 100644 --- a/galera.spec +++ b/galera.spec @@ -1,6 +1,6 @@ Name: galera -Version: 26.4.5 -Release: 2%{?dist} +Version: 26.4.6 +Release: 1%{?dist} Summary: Synchronous multi-master wsrep provider (replication engine) License: GPLv2 @@ -51,6 +51,7 @@ replication engine see http://www.codership.com. # https://bugzilla.redhat.com/show_bug.cgi?id=1863592 # Reported upstream: # https://github.com/codership/galera/issues/577 +# Update for 26.4.6: The strict_build_flags still FTBFS on armv7hl and i686 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 scons-3 %{?_smp_mflags} strict_build_flags=0 %else @@ -65,7 +66,6 @@ install -D -m 755 libgalera_smm.so %{buildroot}%{_libdir}/galera/libgalera_smm.s install -D -m 644 garb/files/garb.cnf %{buildroot}%{_sysconfdir}/sysconfig/garb install -D -m 644 COPYING %{buildroot}%{_docdir}/galera/COPYING install -D -m 644 asio/LICENSE_1_0.txt %{buildroot}%{_docdir}/galera/LICENSE.asio -install -D -m 644 www.evanjones.ca/LICENSE %{buildroot}%{_docdir}/galera/LICENSE.crc32 install -D -m 644 scripts/packages/README %{buildroot}%{_docdir}/galera/README install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/README-MySQL @@ -92,12 +92,14 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE %{_libdir}/galera/libgalera_smm.so %doc %{_docdir}/galera/COPYING %doc %{_docdir}/galera/LICENSE.asio -%doc %{_docdir}/galera/LICENSE.crc32 %doc %{_docdir}/galera/README %doc %{_docdir}/galera/README-MySQL %changelog +* Wed Nov 04 2020 Michal Schorm - 26.4.6-1 +- Rebase to 26.4.6 + * Thu Sep 17 2020 Michal Schorm - 26.4.5-2 - Extend the workaround also to ELN diff --git a/sources b/sources index ba5dbb2..3933c95 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (galera-26.4.5.tar.gz) = 5f0fb385ffc1576d9567357777a0a1f616af8562cc614ee39b1d78cb77124df5bb5640e31d296e2e018ad04edae0eb8e925282e1d7dcb4dd590089cd39039b1d +SHA512 (galera-26.4.6.tar.gz) = 512b6f226ae0a4da9b02df6edd22a41eb126b89b1ef5757c25c5815e4c9fca6ae5b7297a6c27ba1a14e88ccc70a5f513c18c750e3fa46f79b221bb77e269729e