From d2448feb7069913ec2a99069ce455ff63fba4106 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 05 2021 15:39:36 +0000 Subject: import galera-26.4.7-1.module+el8.4.0+10457+88cd7ba1 --- diff --git a/.galera.metadata b/.galera.metadata index d22816c..bcf1650 100644 --- a/.galera.metadata +++ b/.galera.metadata @@ -1 +1 @@ -f8e64c78a1e0455047fc6f61898e6fa1fec4ce7b SOURCES/galera-26.4.6.tar.gz +88296dbfb7f63bb1179ed735492742400dfb3374 SOURCES/galera-26.4.7.tar.gz diff --git a/.gitignore b/.gitignore index ab97088..32ab765 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/galera-26.4.6.tar.gz +SOURCES/galera-26.4.7.tar.gz diff --git a/SPECS/galera.spec b/SPECS/galera.spec index 6858dd0..bad1079 100644 --- a/SPECS/galera.spec +++ b/SPECS/galera.spec @@ -1,6 +1,6 @@ Name: galera -Version: 26.4.6 -Release: 2%{?dist} +Version: 26.4.7 +Release: 1%{?dist} Summary: Synchronous multi-master wsrep provider (replication engine) License: GPLv2 @@ -47,12 +47,9 @@ replication engine see http://www.codership.com. # --warn=all # debug=0 -# Workaround for FTBFS on F33+ -# 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} >= 8 +# Update for 26.4.6: The strict_build_flags FTBFS on armv7hl and i686; fails to find check.h on RHEL +# Update for 26.4.7: The strict_build_flags FTBFS ppc64le, failing tests +%ifarch i686 ppc64le scons-3 %{?_smp_mflags} strict_build_flags=0 %else scons-3 %{?_smp_mflags} strict_build_flags=1 @@ -97,6 +94,9 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE %changelog +* Mon Mar 22 2021 Michal Schorm - 26.4.7-1 +- Rebase to 26.4.7 + * Mon Dec 07 2020 Honza Horak - 26.4.6-2 - Do not use scrict flags on RHEL-8, it does not find check.h that way Related: #1855781