Merge branch 'master' into mariadb-10.3

This commit is contained in:
Michal Schorm 2019-11-27 15:42:32 +01:00
commit 8b4fb5f8ca
3 changed files with 9 additions and 10 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -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
# Possibly usefull arguments:
@ -122,7 +117,10 @@ 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
* Wed Nov 06 2019 Michal Schorm <mschorm@redhat.com> - 25.3.28-1
- Rebase to 25.3.28
* Thu 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

View File

@ -1 +1 @@
SHA512 (galera-25.3.26.tar.gz) = c462e70e8394ac4cfebca94320199ca4e012db100369788f3efdf1a04a8185908954e575fdb5714524931feeea432c2ed6f8d6ff985b1a47bdb16b4c4f54bdc4
SHA512 (galera-25.3.28.tar.gz) = 8ff135022e820fc6a1d33ea1fa6e8677702ed7a7fbf460d45c28cdfe287c666949027989c3152311641debf183f3e8062f561c9935e51d3355df8ba087c5d132