Rebase to 25.3.25

This commit is contained in:
Michal Schorm 2019-01-03 04:30:14 +01:00
parent 22ac6c095b
commit 6096c488ed
4 changed files with 11 additions and 7 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
/galera-3-25.3.16.tar.gz /galera-3-25.3.16.tar.gz
/galera-25.3.22.tar.gz /galera-25.3.22.tar.gz
/galera-25.3.23.tar.gz /galera-25.3.23.tar.gz
/galera-25.3.25.tar.gz

View File

@ -8,10 +8,10 @@ diff -up galera-25.3.23/SConstruct.bak galera-25.3.23/SConstruct
env.Replace(LINK = link) env.Replace(LINK = link)
# Get compiler name/version, CXX may be set to "c++" which may be clang or gcc # Get compiler name/version, CXX may be set to "c++" which may be clang or gcc
-cc_version = read_first_line(env['CC'].split() + ['--version']) -cc_version = str(read_first_line(env['CC'].split() + ['--version']))
-cxx_version = read_first_line(env['CXX'].split() + ['--version']) -cxx_version = str(read_first_line(env['CXX'].split() + ['--version']))
+cc_version = read_first_line(env['CC'].split() + ['--version']).decode() +cc_version = str(read_first_line(env['CC'].split() + ['--version']).decode())
+cxx_version = read_first_line(env['CXX'].split() + ['--version']).decode() +cxx_version = str(read_first_line(env['CXX'].split() + ['--version']).decode())
print('Using C compiler executable: ' + env['CC']) print('Using C compiler executable: ' + env['CC'])
print('C compiler version is: ' + cc_version) print('C compiler version is: ' + cc_version)

View File

@ -1,6 +1,6 @@
Name: galera Name: galera
Version: 25.3.23 Version: 25.3.25
Release: 5%{?dist} Release: 1%{?dist}
Summary: Synchronous multi-master wsrep provider (replication engine) Summary: Synchronous multi-master wsrep provider (replication engine)
License: GPLv2 License: GPLv2
@ -88,6 +88,9 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE
%changelog %changelog
* Thu Jan 01 2019 Michal Schorm <mschorm@redhat.com> - 25.3.25-1
- Rebase to 25.3.25
* Mon Jul 16 2018 Honza Horak <hhorak@redhat.com> - 25.3.23-5 * Mon Jul 16 2018 Honza Horak <hhorak@redhat.com> - 25.3.23-5
- Require asio also on rhel - Require asio also on rhel

View File

@ -1 +1 @@
SHA512 (galera-25.3.23.tar.gz) = f51d5d14e256f1ef385caf0f763cec2af7536c87995a725aff93dec82772f1af24f7739819a9a8fc199e362d7b9674909eaaea7639e4a5f92814baefae29b11d SHA512 (galera-25.3.25.tar.gz) = 231f58c52437a98440bfa6d6ba05a87fbd6353fe67d4380fff7c15f759a5bd11732d30b8d58d72e0641fd2df180fcec10f88fa8282a8ca1affa3c762644b471e