Merge branch 'master' into mariadb-10.3

This commit is contained in:
Michal Schorm 2019-08-22 12:47:16 +02:00
commit e40cfe2880

View File

@ -1,6 +1,6 @@
Name: galera
Version: 25.3.26
Release: 1%{?dist}
Release: 3%{?dist}
Summary: Synchronous multi-master wsrep provider (replication engine)
License: GPLv2
@ -56,6 +56,12 @@ export CPPFLAGS CFLAGS CXXFLAGS
# --warn=all
# debug=0
# https://bugzilla.redhat.com/show_bug.cgi?id=1735233
# https://bugzilla.redhat.com/show_bug.cgi?id=1737108
%if 0%{?fedora} >= 31
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
@ -116,6 +122,12 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE
%changelog
* Fri Aug 01 2019 Michal Schorm <mschorm@redhat.com> - 25.3.26-3
- Fix for #1735233 and #1737108
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 25.3.26-2
- 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