- updated to 5.6.17-65.0, sphinx to 2.1.8, drop obsolete bison patch

diff --git a/mysql.spec b/mysql.spec
index 1e6435d30c535a4b92bf9fbb547100e3eb691c39..1bc74b8fb7edd4f53966307544fcd7f7d9d55249 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -23,8 +23,8 @@
 %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                rel     3
-%define                percona_rel     64.1
+%define                rel     0.1
+%define                percona_rel     65.0
 %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,16 @@ Summary(ru.UTF-8):  MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):     MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
-Version:       5.6.16
+Version:       5.6.17
 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: ba75fbcc530dc74ebb978cf450c011b3
-Source100:     http://www.sphinxsearch.com/files/sphinx-2.1.6-release.tar.gz
-# Source100-md5:       f416c743c0e0f4e337b4549928d8494f
+# Source0-md5: 064e0c9275ec87fd7a16a32c28a9963b
+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
@@ -73,11 +73,10 @@ Patch18:    %{name}-sphinx.patch
 Patch19:       %{name}-chain-certs.patch
 # from fedora
 Patch20:       %{name}-dubious-exports.patch
-Patch21:       bison3.patch
-Patch22:       bug-66589.patch
-Patch23:       bug-44278.patch
-Patch24:       %{name}-cmake.patch
-Patch25:       %{name}-readline.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
@@ -516,7 +515,6 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-%patch25 -p1
 
 # to get these files rebuild
 [ -f sql/sql_yacc.cc ] && rm sql/sql_yacc.cc