X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmysql.git;a=blobdiff_plain;f=mysql.spec;h=5fc80051d4b4deec42d4b2d41894f102312a8ab0;hp=cfda9df85a0911df89866d76f68c401ad8854144;hb=51285a32a905f6eb59bbe0ee0d3958aa6501d40f;hpb=66b5397460d30f7b9da47f68ce02eb248791795c diff --git a/mysql.spec b/mysql.spec index cfda9df..5fc8005 100644 --- 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 0.1 -%define percona_rel 65.0 +%define rel 1 +%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.17 +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: 064e0c9275ec87fd7a16a32c28a9963b -Source100: http://www.sphinxsearch.com/files/sphinx-2.1.8-release.tar.gz -# Source100-md5: ef21091bb30a82f175be5bf9142490b7 +# 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 @@ -534,7 +528,7 @@ cd build -DCMAKE_BUILD_TYPE=%{!?debug:RelWithDebInfo}%{?debug:Debug} \ -DCMAKE_C_FLAGS_RELEASE="%{rpmcflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing" \ -DCMAKE_CXX_FLAGS_RELEASE="%{rpmcxxflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing" \ - -DCOMPILATION_COMMENT="PLD/Linux Distribution MySQL RPM" \ + -DCOMPILATION_COMMENT="TLD Linux MySQL RPM" \ -DCURSES_INCLUDE_PATH=/usr/include/ncurses \ %{?with_systemtap:-DENABLE_DTRACE=ON} \ -DFEATURE_SET="community" \ @@ -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 \ .. @@ -634,7 +630,6 @@ mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/innochecksum mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/myisamchk mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/myisamlog mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/myisampack -#mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysql_fix_privilege_tables mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/my_print_defaults sed -i -e 's#/usr/bin/my_print_defaults#%{_sbindir}/my_print_defaults#g' $RPM_BUILD_ROOT%{_bindir}/mysql_install_db mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysqlcheck @@ -644,9 +639,6 @@ mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysqlcheck %{__rm} $RPM_BUILD_ROOT%{_bindir}/mysqld_safe %{__rm} $RPM_BUILD_ROOT%{_bindir}/mysqld_multi %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysqld_{multi,safe}* -#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql-log-rotate -#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql.server -#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/binary-configure %{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/errmsg-utf8.txt %{__rm} $RPM_BUILD_ROOT%{_bindir}/mysql_waitpid %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql_waitpid.1* @@ -762,7 +754,7 @@ for config in $(awk -F= '!/^#/ && /=/{print $1}' /etc/%{name}/clusters.conf); do fi if [ ! -f "$config_file" ]; then - echo >&2 "Lost myself! Please report this (with above errors, if any) to http://bugs.pld-linux.org/" + echo >&2 "Lost myself! Please report this (with above errors, if any) to TLD Linux mailing lists." exit 1 fi echo "Adding option old-passwords to config: $config_file" @@ -801,7 +793,7 @@ for config in $(awk -F= '!/^#/ && /=/{print $1}' /etc/%{name}/clusters.conf); do fi if [ ! -f "$config_file" ]; then - echo >&2 "ERROR: Can't find real config file for $config! Please report this (with above errors, if any) to http://bugs.pld-linux.org/" + echo >&2 "ERROR: Can't find real config file for $config! Please report this (with above errors, if any) to TLD Linux mailing lists." continue fi configs="$configs $config_file" @@ -840,7 +832,7 @@ for config in $(awk -F= '!/^#/ && /=/{print $1}' /etc/%{name}/clusters.conf); do fi if [ ! -f "$config_file" ]; then - echo >&2 "ERROR: Can't find real config file for $config! Please report this (with above errors, if any) to http://bugs.pld-linux.org/" + echo >&2 "ERROR: Can't find real config file for $config! Please report this (with above errors, if any) to TLD Linux mailing lists." continue fi configs="$configs $config_file" @@ -877,7 +869,6 @@ done %attr(755,root,root) %{_sbindir}/myisamchk %attr(755,root,root) %{_sbindir}/myisamlog %attr(755,root,root) %{_sbindir}/myisampack -#%attr(755,root,root) %{_sbindir}/mysql_fix_privilege_tables %attr(755,root,root) %{_sbindir}/mysql_plugin %attr(755,root,root) %{_sbindir}/mysql_upgrade %attr(755,root,root) %{_sbindir}/mysqlcheck @@ -885,19 +876,18 @@ 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 %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/dialog.so -#%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/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/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 @@ -911,7 +901,6 @@ done %{_mandir}/man1/myisamchk.1* %{_mandir}/man1/myisamlog.1* %{_mandir}/man1/myisampack.1* -#%{_mandir}/man1/mysql_fix_privilege_tables.1* %{_mandir}/man1/mysql_plugin.1* %{_mandir}/man1/mysql_upgrade.1* %{_mandir}/man1/mysqlcheck.1* @@ -941,7 +930,6 @@ done %{_datadir}/%{name}/dictionary.txt %{_datadir}/%{name}/fill_help_tables.sql %{_datadir}/%{name}/innodb_memcached_config.sql -#%{_datadir}/%{name}/mysql_fix_privilege_tables.sql %lang(bg) %{_datadir}/%{name}/bulgarian %lang(cs) %{_datadir}/%{name}/czech %lang(da) %{_datadir}/%{name}/danish @@ -1080,10 +1068,6 @@ done %{_mandir}/man1/mysqltest.1* %{_mandir}/man1/mysqltest_embedded.1* -#%files doc -#%defattr(644,root,root,755) -#%doc Docs/manual.html Docs/manual_toc.html - %if %{with ndb} %files ndb %defattr(644,root,root,755)