From 6096c488ed29b5a73bc62eb8500635f530f5e607 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Jan 03 2019 03:30:44 +0000
Subject: Rebase to 25.3.25


---

diff --git a/.gitignore b/.gitignore
index eaf4e90..f1de323 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /galera-3-25.3.16.tar.gz
 /galera-25.3.22.tar.gz
 /galera-25.3.23.tar.gz
+/galera-25.3.25.tar.gz
diff --git a/galera-python3.patch b/galera-python3.patch
index 13bda0b..59bb4f1 100644
--- a/galera-python3.patch
+++ b/galera-python3.patch
@@ -8,10 +8,10 @@ diff -up galera-25.3.23/SConstruct.bak galera-25.3.23/SConstruct
      env.Replace(LINK = link)
  
  # 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'])
--cxx_version = read_first_line(env['CXX'].split() + ['--version'])
-+cc_version = read_first_line(env['CC'].split() + ['--version']).decode()
-+cxx_version = read_first_line(env['CXX'].split() + ['--version']).decode()
+-cc_version = str(read_first_line(env['CC'].split() + ['--version']))
+-cxx_version = str(read_first_line(env['CXX'].split() + ['--version']))
++cc_version = str(read_first_line(env['CC'].split() + ['--version']).decode())
++cxx_version = str(read_first_line(env['CXX'].split() + ['--version']).decode())
  
  print('Using C compiler executable: ' + env['CC'])
  print('C compiler version is: ' + cc_version)
diff --git a/galera.spec b/galera.spec
index efb5e6d..cc976cd 100644
--- a/galera.spec
+++ b/galera.spec
@@ -1,6 +1,6 @@
 Name:           galera
-Version:        25.3.23
-Release:        5%{?dist}
+Version:        25.3.25
+Release:        1%{?dist}
 Summary:        Synchronous multi-master wsrep provider (replication engine)
 
 License:        GPLv2
@@ -88,6 +88,9 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE
 
 
 %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
 - Require asio also on rhel
 
diff --git a/sources b/sources
index a99f417..37d9fae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (galera-25.3.23.tar.gz) = f51d5d14e256f1ef385caf0f763cec2af7536c87995a725aff93dec82772f1af24f7739819a9a8fc199e362d7b9674909eaaea7639e4a5f92814baefae29b11d
+SHA512 (galera-25.3.25.tar.gz) = 231f58c52437a98440bfa6d6ba05a87fbd6353fe67d4380fff7c15f759a5bd11732d30b8d58d72e0641fd2df180fcec10f88fa8282a8ca1affa3c762644b471e