- mysqlhotcopy is gone from upstream, do not require it

[packages/mysql.git] / mysql.spec

diff --git a/mysql.spec b/mysql.spec
index f4037c9344cb67db3e36715dafc2ebffa1421ca8..8abb1649add0ac9d303e428650dfab34fe454c67 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -21,7 +21,7 @@
 %bcond_without sphinx          # Sphinx storage engine support
 # mysql needs boost 1.59.0 and doesn't support newer/older boost versions
 %bcond_with    system_boost
-%bcond_with    tests           # FIXME: don't run correctly
+%bcond_without tests           # run test suite
 %bcond_with    ndb             # NDB is now a separate product, this here is broken, so disable it
 
 %include       /usr/lib/rpm/macros.perl
@@ -34,12 +34,12 @@ Summary(ru.UTF-8):  MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):     MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
-Version:       5.7.17
-Release:       0.3
+Version:       5.7.21
+Release:       2
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 Source0:       http://cdn.mysql.com/Downloads/MySQL-5.7/%{name}-%{version}.tar.gz
-# Source0-md5: db2a87ede6132b226f8d43d3ac349284
+# Source0-md5: e26523b174bdc3fd0fde6f36791ce17e
 Source100:     http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
 # Source100-md5:       5cac34f3d78a9d612ca4301abfcbd666
 %if %{without system_boost}
@@ -70,10 +70,9 @@ Patch24:     %{name}-cmake.patch
 
 Patch26:       %{name}dumpslow-clusters.patch
 URL:           http://www.mysql.com/products/community/
-BuildRequires: automake
 BuildRequires: bison >= 1.875
 %{?with_system_boost:BuildRequires:    boost-devel >= 1.59.0}
-BuildRequires: cmake >= 2.6
+BuildRequires: cmake >= 2.8.2
 BuildRequires: libaio-devel
 BuildRequires: libevent-devel
 BuildRequires: libhsclient-devel
@@ -85,6 +84,7 @@ BuildRequires:        ncurses-devel >= 4.2
 %{?with_ssl:BuildRequires:     openssl-devel >= 0.9.7d}
 BuildRequires: pam-devel
 BuildRequires: perl-devel >= 1:5.6.1
+BuildRequires: protobuf-devel >= 2.5
 BuildRequires: python-modules
 BuildRequires: readline-devel >= 6.2
 BuildRequires: rpm-perlprov >= 4.1-13
@@ -257,8 +257,6 @@ Summary:    MySQL additional utilities written in Perl
 Summary(pl.UTF-8):     Dodatkowe narzędzia do MySQL napisane w Perlu
 Group:         Applications/Databases
 Requires:      %{name}-extras = %{version}-%{release}
-# this is just for the sake of smooth upgrade, not to break systems
-Requires:      mysqlhotcopy = %{version}-%{release}
 Requires:      perl-DBD-mysql
 
 %description extras-perl
@@ -520,7 +518,8 @@ CPPFLAGS="%{rpmcppflags}" \
        -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \
        -DWITH_PIC=ON \
        -DWITH_LZ4=system \
-       -DWITH_LIBEVENT="system" \
+       -DWITH_LIBEVENT=system \
+       -DWITH_PROTOBUF=system \
        -DWITH_SSL=%{?with_ssl:system}%{!?with_ssl:no} \
        -DWITH_UNIT_TESTS=%{?with_tests:ON}%{!?with_tests:OFF} \
        %{!?with_system_boost:-DWITH_BOOST="$(pwd)/$(ls -1d ../boost_*)"} \
@@ -877,7 +876,6 @@ done
 
 %files
 %defattr(644,root,root,755)
-%doc build/support-files/*.cnf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
@@ -900,6 +898,7 @@ done
 %attr(755,root,root) %{_libdir}/%{name}/plugin/auth.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/auth_socket.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/auth_test_plugin.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/authentication_ldap_sasl_client.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/connection_control.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/group_replication.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/keyring_file.so