[packages/mysql/MYSQL_5_6] - rel 1; percona did change internal hsclient library, so we can't use system one now

[arekm]

commit 8b30bad827288e054a7fb9b55266fed658c9a1c8
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Jan 18 20:41:33 2017 +0100

    - rel 1; percona did change internal hsclient library, so we can't use system one now

 mysql.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index f8ff1fe..3d18e09 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -23,13 +23,14 @@
 %bcond_without	tokudb		# TokuDB
 %bcond_with	tests		# FIXME: don't run correctly
 %bcond_with	ndb		# NDB is now a separate product, this here is broken, so disable it
+%bcond_with	system_hsclient # breaks builds with percona >= 5.6.33
 
 # tokudb is only supported on x86_64
 %ifnarch %{x8664}
 %undefine	with_tokudb
 %endif
 
-%define		rel	0.1
+%define		rel	1
 %define		percona_rel	79.1
 %include	/usr/lib/rpm/macros.perl
 Summary:	MySQL: a very fast and reliable SQL database engine
@@ -98,7 +99,7 @@ BuildRequires:	libstdc++4-devel >= 5:4.0
 BuildRequires:	libstdc++-devel >= 5:4.0
 %endif
 BuildRequires:	automake
-BuildRequires:	libhsclient-devel
+%{?with_system_hsclient:BuildRequires:	libhsclient-devel}
 %{?with_tcpd:BuildRequires:	libwrap-devel}
 BuildRequires:	ncurses-devel >= 4.2
 %{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7d}
@@ -524,7 +525,7 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
+%{?with_system_hsclient:%patch5 -p1}
 %patch6 -p1
 
 %patch9 -p1
@@ -945,7 +946,7 @@ done
 %attr(755,root,root) %{_libdir}/%{name}/plugin/qa_auth_interface.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/qa_auth_server.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/query_response_time.so
-%attr(755,root,root) %{_libdir}/%{name}/plugin/scalability_metrics.so
+#%attr(755,root,root) %{_libdir}/%{name}/plugin/scalability_metrics.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/semisync_master.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/semisync_slave.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/validate_password.so
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/8b30bad827288e054a7fb9b55266fed658c9a1c8