X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmysql.git;a=blobdiff_plain;f=mysql.spec;h=5fc80051d4b4deec42d4b2d41894f102312a8ab0;hp=1846e58009e0253e39a1a4600de1721e65969979;hb=51285a32a905f6eb59bbe0ee0d3958aa6501d40f;hpb=edaab7841fdf157884d2e56fe114765b5ef9c504

diff --git a/mysql.spec b/mysql.spec
index 1846e58..5fc8005 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -24,7 +24,7 @@
 %bcond_with	ndb		# NDB is now a separate product, this here is broken, so disable it
 
 %define		rel	1
-%define		percona_rel	69.0
+%define		percona_rel	76.2
 %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
@@ -35,16 +35,14 @@ Summary(ru.UTF-8):	MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):	MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):	MySQL数据库服务器
 Name:		mysql
-Version:	5.6.21
+Version:	5.6.29
 Release:	%{percona_rel}.%{rel}
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
-# Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads
-# Source0:	http://vesta.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.5/%{name}-%{version}.tar.gz
 Source0:	http://www.percona.com/downloads/Percona-Server-5.6/LATEST/source/tarball/percona-server-%{version}-%{percona_rel}.tar.gz
-# Source0-md5:	8b709c247b72aee4367904ec12b81f12
-Source100:	http://www.sphinxsearch.com/files/sphinx-2.2.5-release.tar.gz
-# Source100-md5:	ab0007c9b128b6fde17d936c131f7a17
+# Source0-md5:	8a0e3327e5b850852af6b9ca614d6bd7
+Source100:	http://www.sphinxsearch.com/files/sphinx-2.2.10-release.tar.gz
+# Source100-md5:	dda52b24d8348fc09e26d8a649a231d2
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.logrotate
@@ -75,8 +73,6 @@ Patch19:	%{name}-chain-certs.patch
 Patch20:	%{name}-dubious-exports.patch
 Patch21:	bug-66589.patch
 Patch22:	bug-44278.patch
-Patch23:	%{name}-cmake.patch
-Patch24:	%{name}-readline.patch
 URL:		http://www.mysql.com/products/community/
 BuildRequires:	bison >= 1.875
 BuildRequires:	cmake >= 2.6
@@ -513,8 +509,6 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
-%patch23 -p1
-%patch24 -p1
 
 # to get these files rebuild
 [ -f sql/sql_yacc.cc ] && rm sql/sql_yacc.cc
@@ -552,8 +546,10 @@ cd build
 	-DWITH_PAM=ON \
 	-DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \
 	-DWITH_PIC=ON \
-	-DWITH_EDITLINE=system \
+	-DWITH_READLINE=system \
 	-DWITH_SSL=%{?with_ssl:system}%{!?with_ssl:no} \
+	-DWITHOUT_TOKUDB=1 \
+	-DWITHOUT_TOKUDB_STORAGE_ENGINE=1 \
 	-DWITH_UNIT_TESTS=%{?with_tests:ON}%{!?with_tests:OFF} \
 	-DWITH_ZLIB=system \
 	..