From eee0d803ff4b1fffb8b1d4dc3120a0a061e4436b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 30 2021 17:21:39 +0000 Subject: import galera-25.3.31-1.module+el8.3.0+8843+3f4e42f6 --- diff --git a/.galera.metadata b/.galera.metadata index ca5c6f1..ff7b0fd 100644 --- a/.galera.metadata +++ b/.galera.metadata @@ -1 +1 @@ -66615f585b3413fd112087092cc63be5b5bba57d SOURCES/galera-25.3.26.tar.gz +824f0bb5cd50771bf90b1dc2705b56bbfab6aed9 SOURCES/galera-25.3.31.tar.gz diff --git a/.gitignore b/.gitignore index fd60ea0..0aa3b4f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/galera-25.3.26.tar.gz +SOURCES/galera-25.3.31.tar.gz diff --git a/SPECS/galera.spec b/SPECS/galera.spec index 0fa69d1..cc0782a 100644 --- a/SPECS/galera.spec +++ b/SPECS/galera.spec @@ -1,5 +1,5 @@ Name: galera -Version: 25.3.26 +Version: 25.3.31 Release: 1%{?dist} Summary: Synchronous multi-master wsrep provider (replication engine) @@ -8,7 +8,7 @@ URL: http://galeracluster.com/ # Actually, the truth is, we do use galera source tarball provided by MariaDB on # following URL (without macros): -# https://mirror.vpsfree.cz/mariadb/mariadb-10.2.13/galera-25.3.23/src/galera-25.3.23.tar.gz +# https://archive.mariadb.org/mariadb-10.3.26/galera-25.3.31/src/galera-25.3.31.tar.gz Source0: http://releases.galeracluster.com/source/%{name}-%{version}.tar.gz @@ -40,12 +40,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 @@ -56,12 +50,14 @@ export CPPFLAGS CFLAGS CXXFLAGS # --warn=all # debug=0 -%if %_arch == i686 || %_arch == i386 +%ifarch i686 scons-3 %{?_smp_mflags} strict_build_flags=0 %else scons-3 %{?_smp_mflags} strict_build_flags=1 %endif + + %install install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/garbd.service install -D -m 755 %{SOURCE2} %{buildroot}%{_sbindir}/garbd-wrapper @@ -71,7 +67,6 @@ 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 chromium/LICENSE %{buildroot}%{_docdir}/galera/LICENSE.chromium 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 @@ -89,7 +84,6 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE %files -%defattr(-,root,root,-) %config(noreplace,missingok) %{_sysconfdir}/sysconfig/garb %dir %{_docdir}/galera %dir %{_libdir}/galera @@ -99,13 +93,16 @@ 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/LICENSE.chromium %doc %{_docdir}/galera/README %doc %{_docdir}/galera/README-MySQL %changelog +* Tue Nov 10 2020 Michal Schorm - 25.3.31-1 +- Rebase to 25.3.31 + Resolves: #1731289, #1856812 + * Thu Jul 18 2019 Michal Schorm - 25.3.26-1 - Rebase to 25.3.26 Resolves: #1687879