From ce12653f7e9db8d3b50fd939fce07d0f646be532 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 6 Nov 2019 13:50:55 +0100 Subject: [PATCH] Rebase to 25.3.28 Workaround for F30 removed (F30 was fixed) --- .gitignore | 1 + galera.spec | 16 +++++++--------- sources | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 1537e46..de1066f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /galera-25.3.23.tar.gz /galera-25.3.25.tar.gz /galera-25.3.26.tar.gz +/galera-25.3.28.tar.gz diff --git a/galera.spec b/galera.spec index 442d603..a5f752e 100644 --- a/galera.spec +++ b/galera.spec @@ -1,6 +1,6 @@ Name: galera -Version: 25.3.26 -Release: 3%{?dist} +Version: 25.3.28 +Release: 1%{?dist} Summary: Synchronous multi-master wsrep provider (replication engine) License: GPLv2 @@ -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://mirror.vpsfree.cz/mariadb/mariadb-10.3.19/galera-25.3.28/src/galera-25.3.28.tar.gz Source0: http://releases.galeracluster.com/source/%{name}-%{version}.tar.gz @@ -62,12 +62,7 @@ export CPPFLAGS CFLAGS CXXFLAGS alias scons-3='scons' %endif -%if 0%{?fedora} == 30 && %_arch == ppc64le -# Workaround for a bug which was solved in Rawhide -scons-3 %{?_smp_mflags} strict_build_flags=0 -%else scons-3 %{?_smp_mflags} strict_build_flags=1 -%endif @@ -114,7 +109,10 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE %changelog -* Fri Aug 01 2019 Michal Schorm - 25.3.26-3 +* Wed Nov 06 2019 Michal Schorm - 25.3.28-1 +- Rebase to 25.3.28 + +* Thu Aug 01 2019 Michal Schorm - 25.3.26-3 - Fix for #1735233 and #1737108 * Thu Jul 25 2019 Fedora Release Engineering - 25.3.26-2 diff --git a/sources b/sources index cc8c46d..fb0ffc4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (galera-25.3.26.tar.gz) = c462e70e8394ac4cfebca94320199ca4e012db100369788f3efdf1a04a8185908954e575fdb5714524931feeea432c2ed6f8d6ff985b1a47bdb16b4c4f54bdc4 +SHA512 (galera-25.3.28.tar.gz) = 8ff135022e820fc6a1d33ea1fa6e8677702ed7a7fbf460d45c28cdfe287c666949027989c3152311641debf183f3e8062f561c9935e51d3355df8ba087c5d132