From 345174466bf9a722b03f6d3a557614b050125110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Dor=C5=88=C3=A1k?= <jdornak@redhat.com>
Date: Thu, 7 Apr 2016 11:07:01 +0200
Subject: [PATCH] wsrep_on in galera.cnf

---
 mariadb-galera.cnf.patch | 12 ++++++++++++
 mariadb.spec             | 11 +++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 mariadb-galera.cnf.patch

diff --git a/mariadb-galera.cnf.patch b/mariadb-galera.cnf.patch
new file mode 100644
index 0000000..095cdf4
--- /dev/null
+++ b/mariadb-galera.cnf.patch
@@ -0,0 +1,12 @@
+--- mariadb-10.1.13/support-files/wsrep.cnf.sh.orig	2016-03-24 10:12:15.000000000 +0100
++++ mariadb-10.1.13/support-files/wsrep.cnf.sh	2016-04-07 10:18:34.281155365 +0200
+@@ -30,6 +30,9 @@ bind-address=0.0.0.0
+ ## WSREP options
+ ##
+ 
++# Enable wsrep
++wsrep_on=1
++
+ # Full path to wsrep provider library or 'none'
+ wsrep_provider=none
+ 
diff --git a/mariadb.spec b/mariadb.spec
index ce40ed9..2010cae 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -123,7 +123,7 @@
 
 Name:             mariadb
 Version:          %{compatver}.%{bugfixver}
-Release:          2%{?with_debug:.debug}%{?dist}
+Release:          3%{?with_debug:.debug}%{?dist}
 Epoch:            1
 
 Summary:          A community developed branch of MySQL
@@ -177,6 +177,9 @@ Patch34:          %{pkgnamepatch}-covscan-stroverflow.patch
 Patch36:          %{pkgnamepatch}-ssltest.patch
 Patch37:          %{pkgnamepatch}-notestdb.patch
 
+# Patches for galera
+Patch40:          %{pkgnamepatch}-galera.cnf.patch
+
 BuildRequires:    cmake
 BuildRequires:    libaio-devel
 BuildRequires:    libedit-devel
@@ -552,6 +555,7 @@ MariaDB is a community developed branch of MySQL.
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch40 -p1
 
 sed -i -e 's/2.8.7/2.6.4/g' cmake/cpack_rpm.cmake
 
@@ -786,7 +790,7 @@ install -p -m 0644 %{SOURCE16} %{basename:%{SOURCE16}}
 install -p -m 0644 %{SOURCE71} %{basename:%{SOURCE71}}
 
 # install galera config file
-sed -i -r 's|^wsrep_provider=none|wsrep_provider=/usr/lib64/galera/libgalera_smm.so|' support-files/wsrep.cnf
+sed -i -r 's|^wsrep_provider=none|wsrep_provider=%{_libdir}/galera/libgalera_smm.so|' support-files/wsrep.cnf
 install -p -m 0644 support-files/wsrep.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/galera.cnf
 
 # install the clustercheck script
@@ -1245,6 +1249,9 @@ fi
 %endif
 
 %changelog
+* Thu Apr  7 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.13-3
+- wsrep_on in galera.cnf
+
 * Tue Apr  5 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.13-2
 - Moved /etc/sysconfig/clustercheck
     and /usr/share/mariadb/systemd/use_galera_new_cluster.conf