From 26eedb79747ffeb04859a2897a0e650095401f56 Mon Sep 17 00:00:00 2001
From: Honza Horak <hhorak@redhat.com>
Date: Nov 03 2015 12:05:53 +0000
Subject: Expand variables in server.cnf


---

diff --git a/mariadb-ownsetup.patch b/mariadb-ownsetup.patch
index 9fdb94b..23dcba8 100644
--- a/mariadb-ownsetup.patch
+++ b/mariadb-ownsetup.patch
@@ -1,6 +1,17 @@
-diff -rup mariadb-10.1.8.orig/support-files/rpm/server.cnf mariadb-10.1.8/support-files/rpm/server.cnf
---- mariadb-10.1.8.orig/support-files/rpm/server.cnf	2015-10-15 17:44:19.000000000 +0200
-+++ mariadb-10.1.8/support-files/rpm/server.cnf	2015-10-21 15:39:36.298577017 +0200
+diff -up mariadb-10.1.8/support-files/CMakeLists.txt.p9 mariadb-10.1.8/support-files/CMakeLists.txt
+--- mariadb-10.1.8/support-files/CMakeLists.txt.p9	2015-11-03 11:38:46.029139464 +0100
++++ mariadb-10.1.8/support-files/CMakeLists.txt	2015-11-03 11:41:07.107605055 +0100
+@@ -62,6 +62,7 @@ IF(UNIX)
+   ENDIF()
+ 
+   CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
++  CONFIGURE_FILE(rpm/server.cnf ${CMAKE_CURRENT_BINARY_DIR}/rpm/server.cnf @ONLY)
+   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development)
+ 
+   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
+diff -up mariadb-10.1.8/support-files/rpm/server.cnf.p9 mariadb-10.1.8/support-files/rpm/server.cnf
+--- mariadb-10.1.8/support-files/rpm/server.cnf.p9	2015-10-15 17:44:19.000000000 +0200
++++ mariadb-10.1.8/support-files/rpm/server.cnf	2015-11-03 11:38:25.228070808 +0100
 @@ -9,7 +9,16 @@
  [server]
  
diff --git a/mariadb.spec b/mariadb.spec
index ca7264f..2882493 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -24,7 +24,6 @@
 # TokuDB engine is now part of MariaDB, but it is available only for x86_64;
 # variable tokudb allows to build with TokuDB storage engine
 # Temporarily disabled in F21+ for https://mariadb.atlassian.net/browse/MDEV-6446
-#%ifarch 0%{?fedora} < 21 #x86_64
 %ifarch x86_64
 %bcond_without tokudb
 %else
@@ -117,7 +116,7 @@
 
 Name:             mariadb
 Version:          %{compatver}.%{bugfixver}
-Release:          1%{?with_debug:.debug}%{?dist}
+Release:          2%{?with_debug:.debug}%{?dist}
 Epoch:            1
 
 Summary:          A community developed branch of MySQL
@@ -1172,6 +1171,9 @@ fi
 %endif
 
 %changelog
+* Tue Nov 03 2015 Honza Horak <hhorak@redhat.com> - 1:10.1.8-2
+- Expand variables in server.cnf
+
 * Thu Oct 22 2015 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.8-1
 - Update to 10.1.8