From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Wed, 18 Jan 2017 21:22:28 +0000 (+0100)
Subject: - rel 2; make internal libhsclient static
X-Git-Tag: auto/th/mysql-5.6.34-79.1.2
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=7025922373ba5f315dcd8f14537fc4deffc549b0;p=packages%2Fmysql.git

- rel 2; make internal libhsclient static
---

diff --git a/mysql-nosystem-libhsclient.patch b/mysql-nosystem-libhsclient.patch
new file mode 100644
index 0000000..f7eaf60
--- /dev/null
+++ b/mysql-nosystem-libhsclient.patch
@@ -0,0 +1,7 @@
+--- percona-server-5.6.34-79.1/plugin/HandlerSocket-Plugin-for-MySQL/libhsclient/CMakeLists.txt~	2017-01-18 20:55:39.000000000 +0100
++++ percona-server-5.6.34-79.1/plugin/HandlerSocket-Plugin-for-MySQL/libhsclient/CMakeLists.txt	2017-01-18 22:11:36.746121700 +0100
+@@ -1,3 +1,3 @@
+ SET (LIBHSCLIENT_SOURCES config.cpp escape.cpp fatal.cpp hstcpcli.cpp socket.cpp string_util.cpp)
+-ADD_LIBRARY(hsclient ${LIBHSCLIENT_SOURCES})
++ADD_LIBRARY(hsclient STATIC ${LIBHSCLIENT_SOURCES})
+ 
diff --git a/mysql.spec b/mysql.spec
index 8a733f7..486c72d 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -30,7 +30,7 @@
 %undefine	with_tokudb
 %endif
 
-%define		rel	1
+%define		rel	2
 %define		percona_rel	79.1
 %include	/usr/lib/rpm/macros.perl
 Summary:	MySQL: a very fast and reliable SQL database engine
@@ -73,6 +73,7 @@ Patch4:		%{name}-no-default-secure-auth.patch
 Patch5:		%{name}-system-libhsclient.patch
 # from fedora
 Patch6:		%{name}-system-users.patch
+Patch7:		mysql-nosystem-libhsclient.patch
 
 Patch9:		%{name}-build.patch
 Patch11:	%{name}-upgrade.patch
@@ -527,6 +528,7 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch4 -p1
 %{?with_system_hsclient:%patch5 -p1}
 %patch6 -p1
+%patch7 -p1
 
 %patch9 -p1
 %patch11 -p1