From 37d69ca4e12464d7c4f16113e1bd1964eecf1ca9 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 5 Jun 2014 09:00:49 +0000 Subject: [PATCH] - updated to percona 5.5.37-35.1, sphinx to 2.1.8 --- mysql.spec | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/mysql.spec b/mysql.spec index 48fe50b..76cdfbf 100644 --- a/mysql.spec +++ b/mysql.spec @@ -23,7 +23,7 @@ %bcond_with tests # FIXME: don't run correctly %bcond_with ndb # NDB is now a separate product, this here is broken, so disable it -%define percona_rel 33.0 +%define percona_rel 35.1 %include /usr/lib/rpm/macros.perl Summary: MySQL: a very fast and reliable SQL database engine Summary(de.UTF-8): MySQL: ist eine SQL-Datenbank @@ -34,14 +34,14 @@ Summary(ru.UTF-8): MySQL - быстрый SQL-сервер Summary(uk.UTF-8): MySQL - швидкий SQL-сервер Summary(zh_CN.UTF-8): MySQL数据库服务器 Name: mysql -Version: 5.5.35 +Version: 5.5.37 Release: 1 License: GPL + MySQL FLOSS Exception Group: Applications/Databases -Source0: http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/Percona-Server-%{version}-rel%{percona_rel}.tar.gz -# Source0-md5: f64e535a4c6d0cb7daeaf0ba3eeccbd7 -Source100: http://www.sphinxsearch.com/files/sphinx-2.1.4-release.tar.gz -# Source100-md5: 3d453b507834ec746237e2016d34f928 +Source0: http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/tarball/percona-server-%{version}-%{percona_rel}.tar.gz +# Source0-md5: 0ef76fa2ec0559810a8a78800022f9a2 +Source100: http://www.sphinxsearch.com/files/sphinx-2.1.8-release.tar.gz +# Source100-md5: ef21091bb30a82f175be5bf9142490b7 Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.logrotate @@ -71,8 +71,7 @@ Patch18: %{name}-sphinx.patch Patch19: %{name}-chain-certs.patch # from fedora Patch20: %{name}-dubious-exports.patch -Patch21: bison3.patch -Patch22: bug-66589.patch +Patch21: bug-66589.patch URL: http://www.mysql.com/products/community/ BuildRequires: bison >= 1.875 BuildRequires: cmake >= 2.6 @@ -480,7 +479,12 @@ This package contains the standard MySQL NDB CPC Daemon. Ten pakiet zawiera standardowego demona MySQL NDB CPC. %prep -%setup -q -n Percona-Server-%{version}-rel%{percona_rel} %{?with_sphinx:-a100} +%setup -q -n percona-server-%{version}-%{percona_rel} %{?with_sphinx:-a100} + +# we want to use old, mysql compatible client library name +find . -name CMakeLists.txt -exec sed -i -e 's#perconaserverclient#mysqlclient#g' "{}" ";" +sed -i -e 's#perconaserverclient#mysqlclient#g' libmysql/libmysql.{ver.in,map} scripts/mysql_config.* + %if %{with sphinx} # http://www.sphinxsearch.com/docs/manual-0.9.9.html#sphinxse-mysql51 mv sphinx-*/mysqlse storage/sphinx @@ -499,7 +503,6 @@ mv sphinx-*/mysqlse storage/sphinx %patch19 -p1 %patch20 -p1 %patch21 -p1 -%patch22 -p1 # to get these files rebuild [ -f sql/sql_yacc.cc ] && rm sql/sql_yacc.cc @@ -874,6 +877,7 @@ done %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/plugin %attr(755,root,root) %{_libdir}/%{name}/plugin/adt_null.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/audit_log.so %attr(755,root,root) %{_libdir}/%{name}/plugin/auth.so %attr(755,root,root) %{_libdir}/%{name}/plugin/auth_pam.so %attr(755,root,root) %{_libdir}/%{name}/plugin/auth_pam_compat.so @@ -883,12 +887,16 @@ done %attr(755,root,root) %{_libdir}/%{name}/plugin/ha_archive.so %attr(755,root,root) %{_libdir}/%{name}/plugin/ha_blackhole.so %attr(755,root,root) %{_libdir}/%{name}/plugin/ha_federated.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/libfnv_udf.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/libfnv1a_udf.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/libmurmur_udf.so %attr(755,root,root) %{_libdir}/%{name}/plugin/mypluglib.so %attr(755,root,root) %{_libdir}/%{name}/plugin/qa_auth_client.so %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/semisync_master.so %attr(755,root,root) %{_libdir}/%{name}/plugin/semisync_slave.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/scalability_metrics.so %if %{with sphinx} %attr(755,root,root) %{_libdir}/%{name}/plugin/ha_sphinx.so %endif -- 2.46.0