Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/galera.git#7dfe556025ba302979839424ae60405dfc3f0c92
This commit is contained in:
DistroBaker 2021-03-24 23:25:47 +00:00
parent 1c17557468
commit a4a3c7ed61
3 changed files with 15 additions and 12 deletions

1
.gitignore vendored
View File

@ -11,3 +11,4 @@
/galera-26.4.4.tar.gz /galera-26.4.4.tar.gz
/galera-26.4.5.tar.gz /galera-26.4.5.tar.gz
/galera-26.4.6.tar.gz /galera-26.4.6.tar.gz
/galera-26.4.7.tar.gz

View File

@ -1,6 +1,6 @@
Name: galera Name: galera
Version: 26.4.6 Version: 26.4.7
Release: 3%{?dist} Release: 1%{?dist}
Summary: Synchronous multi-master wsrep provider (replication engine) Summary: Synchronous multi-master wsrep provider (replication engine)
License: GPLv2 License: GPLv2
@ -47,16 +47,15 @@ replication engine see http://www.codership.com.
# --warn=all # --warn=all
# debug=0 # debug=0
# Workaround for FTBFS on F33+ # Workaround for version 26.4.7
# https://bugzilla.redhat.com/show_bug.cgi?id=1863592 export CXXFLAGS="$CXXFLAGS -Wno-error=format-extra-args"
# Reported upstream: # ... and for 32 bit arches
# https://github.com/codership/galera/issues/577 export CXXFLAGS="$CXXFLAGS -Wno-error=format"
# Update for 26.4.6: The strict_build_flags still FTBFS on armv7hl and i686 export CFLAGS="$CFLAGS -Wno-error=format-extra-args -Wno-error=format"
%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 # end of workaroound
scons-3 %{?_smp_mflags} strict_build_flags=0
%else
scons-3 %{?_smp_mflags} strict_build_flags=1 scons-3 %{?_smp_mflags} strict_build_flags=1
%endif
%install %install
install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/garbd.service install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/garbd.service
@ -97,6 +96,9 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE
%changelog %changelog
* Tue Feb 23 2021 Michal Schorm <mschorm@redhat.com> - 26.4.7-1
- Rebase to 26.4.7
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 26.4.6-3 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 26.4.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (galera-26.4.6.tar.gz) = 512b6f226ae0a4da9b02df6edd22a41eb126b89b1ef5757c25c5815e4c9fca6ae5b7297a6c27ba1a14e88ccc70a5f513c18c750e3fa46f79b221bb77e269729e SHA512 (galera-26.4.7.tar.gz) = 6c5016aca151c4560db65bed309d8381080546030f003a5aa1177d68685eabbce44dfc2551db8756206831a898659b26d0904a48336b8ba22c0106260577543e