X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmysql.git;a=blobdiff_plain;f=mysql.spec;h=c71fd823203e9a95b020ae40548107d11a862e40;hp=5d82810e8bae449dd9cc90a354522f3a93fa96bb;hb=refs%2Fheads%2Fmaster;hpb=71488f2d6de8db165ea81304ddf96c6ae97d7a58

diff --git a/mysql.spec b/mysql.spec
index 5d82810..15f44b1 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -12,9 +12,10 @@
 %bcond_with	tests		# run test suite
 %bcond_with	ndb		# NDB is now a separate product, this here is broken, so disable it
 %bcond_without	ldap		# LDAP auth support (requires MIT Kerberos)
+%bcond_with	default		# default version of MySQL (with common and devel)
 
-%define mysqlversion 8.2
-%define mysqlpriority 82
+%define mysqlversion 8.4
+%define mysqlpriority 84
 
 Summary:	MySQL: a very fast and reliable SQL database engine
 Summary(de.UTF-8):	MySQL: ist eine SQL-Datenbank
@@ -25,12 +26,12 @@ Summary(ru.UTF-8):	MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):	MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):	MySQL数据库服务器
 Name:		mysql-%{mysqlversion}
-Version:	8.2.0
+Version:	8.4.0
 Release:        1
 License:	GPL v2 + MySQL FOSS License Exception
 Group:		Applications/Databases
 Source0:	http://cdn.mysql.com/Downloads/MySQL-%{mysqlversion}/mysql-%{version}.tar.gz
-# Source0-md5:	9ddeecbdb046cd4a8a4340445206130d
+# Source0-md5:	c3b1ccd1ba5b09f118ce6e27f0f0df98
 Source100:	http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
 # Source100-md5:	5cac34f3d78a9d612ca4301abfcbd666
 %if %{without system_boost}
@@ -52,7 +53,6 @@ Source13:	mysql-client.conf
 Source14:	my.cnf
 Patch0:		no_relative_paths.patch
 Patch1:		mysql-system-xxhash.patch
-Patch2:		zlib.patch
 
 Patch17:	mysql-5.7-sphinx.patch
 Patch18:	mysql-sphinx.patch
@@ -256,7 +256,7 @@ MySQL - wspólne pliki i katalogi.
 Summary:        Common directories for MysSQL %{mysqlversion}
 Summary(pl.UTF-8):      Wspólne pliki i katalogi dla MySQL %{mysqlversion}
 Group:          Applicataion/Databases
-Requires:	mysql-common >= %{version}-%{release}
+Requires:	mysql-common >= 8.0.0
 
 %description dirs
 Common directories for MysSQL %{mysqlversion}
@@ -484,7 +484,6 @@ przekierowywania połączeń od klientów MySQL do serwerów MySQL.
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %if %{with sphinx}
 # http://www.sphinxsearch.com/docs/manual-0.9.9.html#sphinxse-mysql51
@@ -566,7 +565,7 @@ CPPFLAGS="%{rpmcppflags}" \
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{ld.so.conf.d,logrotate.d,rc.d/init.d,sysconfig,mysql/%{mysqlversion},skel} \
-	   $RPM_BUILD_ROOT/var/{lib/mysqlrouter,log/{archive,}/{mysql,mysqlrouter}/%{mysqlversion},lib/{mysql,mysql-files}/%{mysqlversion}} \
+	   $RPM_BUILD_ROOT/var/{log/{archive,}/{mysql,mysqlrouter}/%{mysqlversion},lib/{mysql,mysql-files,mysqlrouter}/%{mysqlversion}} \
 	   $RPM_BUILD_ROOT%{_libdir}
 
 %{__make} -C build install \
@@ -626,7 +625,6 @@ sed -i -e '/libs/s/-lprobes_mysql//' $RPM_BUILD_ROOT%{_libdir}/mysql/%{mysqlvers
 %{?debug:nm -n $RPM_BUILD_ROOT%{_sbindir}/mysqld > $RPM_BUILD_ROOT%{_datadir}/%{name}/mysqld.sym}
 
 # do not clobber users $PATH
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/mysql/%{mysqlversion}/bin,%{_libdir}/mysql/%{mysqlversion}/sbin}/mysql_upgrade
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/mysql/%{mysqlversion}/bin,%{_libdir}/mysql/%{mysqlversion}/sbin}/innochecksum
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/mysql/%{mysqlversion}/bin,%{_libdir}/mysql/%{mysqlversion}/sbin}/myisamchk
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/mysql/%{mysqlversion}/bin,%{_libdir}/mysql/%{mysqlversion}/sbin}/myisamlog
@@ -645,12 +643,10 @@ sed -i -e '/libs/s/-lprobes_mysql//' $RPM_BUILD_ROOT%{_libdir}/mysql/%{mysqlvers
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/mysql/%{mysqlversion}/man/man1/mysqlman.1*
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/mysql/%{mysqlversion}/man/man1/mysqlslap.1*
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/mysql/%{mysqlversion}/man/man1/comp_err.1*
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/mysql/%{mysqlversion}/man/man1/lz4_decompress.1*
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/mysql/%{mysqlversion}/man/man1/zlib_decompress.1*
 
 # we don't package those (we have no -test or -testsuite pkg) and some of them just segfault
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/mysql/%{mysqlversion}/test
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/mysql/%{mysqlversion}/bin/{comp_err,mysql_client_test,mysql_keyring_encryption_test,mysqlslap,mysqltest,mysqltest_safe_process,mysqlxtest,zlib_decompress}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/mysql/%{mysqlversion}/bin/{comp_err,mysql_client_test,mysql_keyring_encryption_test,mysql_test_event_tracking,mysqlslap,mysqltest,mysqltest_safe_process,mysqlxtest}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/mysql/%{mysqlversion}/plugin/test_udf_services.so
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/mysql/%{mysqlversion}/plugin/component_example_*.so
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/mysql/%{mysqlversion}/plugin/component_log_sink_test.so
@@ -701,9 +697,6 @@ update-alternatives \
 update-alternatives \
 	--install %{_sbindir}/myisampack myisampack %{_libdir}/mysql/%{mysqlversion}/sbin/myisampack %{mysqlpriority} \
 	--slave %{_mandir}/man1/myisampack.1 myisampack.1 %{_datadir}/mysql/%{mysqlversion}/man/man1/myisampack.1* || :
-update-alternatives \
-	--install %{_sbindir}/mysql_upgrade mysql_upgrade %{_libdir}/mysql/%{mysqlversion}/sbin/mysql_upgrade %{mysqlpriority} \
-	--slave %{_mandir}/man1/mysql_upgrade.1 mysql_upgrade.1 %{_datadir}/mysql/%{mysqlversion}/man/man1/mysql_upgrade.1* || :
 update-alternatives \
 	--install %{_sbindir}/mysqlcheck mysqlcheck %{_libdir}/mysql/%{mysqlversion}/sbin/mysqlcheck %{mysqlpriority} \
 	--slave %{_mandir}/man1/mysqlcheck.1 mysqlcheck.1 %{_datadir}/mysql/%{mysqlversion}/man/man1/mysqlcheck.1* || :
@@ -721,7 +714,6 @@ if [ "$1" = "0" ]; then
 	update-alternatives --remove myisamchk %{_libdir}/mysql/%{mysqlversion}/sbin/myisamchk || :
 	update-alternatives --remove myisamlog %{_libdir}/mysql/%{mysqlversion}/sbin/myisamlog || :
 	update-alternatives --remove myisampack %{_libdir}/mysql/%{mysqlversion}/sbin/myisampack || :
-	update-alternatives --remove mysql_upgrade %{_libdir}/mysql/%{mysqlversion}/sbin/mysql_upgrade || :
 	update-alternatives --remove mysqlcheck %{_libdir}/mysql/%{mysqlversion}/sbin/mysqlcheck || :
 	update-alternatives --remove mysqld %{_libdir}/mysql/%{mysqlversion}/sbin/mysqld || :
 fi
@@ -1002,7 +994,6 @@ fi
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/sbin/myisamchk
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/sbin/myisamlog
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/sbin/myisampack
-%attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/sbin/mysql_upgrade
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/sbin/mysqlcheck
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/sbin/mysqld
 %dir %{_libdir}/mysql/%{mysqlversion}/plugin
@@ -1026,7 +1017,6 @@ fi
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/plugin/ddl_rewriter.so
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/plugin/group_replication.so
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/plugin/ha_mock.so
-%attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/plugin/keyring_file.so
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/plugin/keyring_udf.so
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/plugin/libpluginmecab.so
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/plugin/locking_service.so
@@ -1055,7 +1045,6 @@ fi
 %{_datadir}/mysql/%{mysqlversion}/man/man1/myisamchk.1*
 %{_datadir}/mysql/%{mysqlversion}/man/man1/myisamlog.1*
 %{_datadir}/mysql/%{mysqlversion}/man/man1/myisampack.1*
-%{_datadir}/mysql/%{mysqlversion}/man/man1/mysql_upgrade.1*
 %{_datadir}/mysql/%{mysqlversion}/man/man1/mysqlcheck.1*
 %{_datadir}/mysql/%{mysqlversion}/man/man8/mysqld.8*
 
@@ -1109,6 +1098,7 @@ fi
 %defattr(644,root,root,755)
 %{_datadir}/mysql/%{mysqlversion}/lang/charsets
 
+%if %{with default}
 %files -n mysql-common
 %defattr(644,root,root,755)
 %attr(751,root,root) %dir %{_sysconfdir}/mysql
@@ -1116,8 +1106,12 @@ fi
 %dir %{_datadir}/mysql
 %attr(751,root,root) %dir /var/lib/mysql
 %attr(751,root,root) %dir /var/lib/mysql-files
+%attr(751,root,root) %dir /var/lib/mysqlrouter
 %attr(751,root,root) %dir /var/log/mysql
 %attr(751,root,root) %dir /var/log/archive/mysql
+%attr(751,root,root) %dir /var/log/mysqlrouter
+%attr(751,root,root) %dir /var/log/archive/mysqlrouter
+%endif
 
 %files dirs
 %defattr(644,root,root,755)
@@ -1137,11 +1131,9 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/bin/myisam_ftdump
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/bin/mysql_secure_installation
-%attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/bin/mysql_ssl_rsa_setup
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/bin/mysql_tzinfo_to_sql
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/bin/perror
 %{_datadir}/mysql/%{mysqlversion}/man/man1/myisam_ftdump.1*
-%{_datadir}/mysql/%{mysqlversion}/man/man1/mysql_ssl_rsa_setup.1*
 %{_datadir}/mysql/%{mysqlversion}/man/man1/mysql_secure_installation.1*
 %{_datadir}/mysql/%{mysqlversion}/man/man1/mysql_tzinfo_to_sql.1*
 %{_datadir}/mysql/%{mysqlversion}/man/man1/perror.1*
@@ -1160,7 +1152,6 @@ fi
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/bin/mysql_config_editor
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/bin/mysqldump
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/bin/mysqlimport
-%attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/bin/mysqlpump
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/bin/mysqlshow
 %{_datadir}/mysql/%{mysqlversion}/man/man1/mysql.1*
 %{_datadir}/mysql/%{mysqlversion}/man/man1/mysqladmin.1*
@@ -1168,7 +1159,6 @@ fi
 %{_datadir}/mysql/%{mysqlversion}/man/man1/mysql_config_editor.1*
 %{_datadir}/mysql/%{mysqlversion}/man/man1/mysqldump.1*
 %{_datadir}/mysql/%{mysqlversion}/man/man1/mysqlimport.1*
-%{_datadir}/mysql/%{mysqlversion}/man/man1/mysqlpump.1*
 %{_datadir}/mysql/%{mysqlversion}/man/man1/mysqlshow.1*
 
 %files libs
@@ -1176,12 +1166,13 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mysql/%{mysqlversion}/mysql-client.conf
 %{_sysconfdir}/mysql/%{mysqlversion}/my.cnf
 %attr(755,root,root) %{_libdir}/libmysqlclient.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmysqlclient.so.22
+%attr(755,root,root) %ghost %{_libdir}/libmysqlclient.so.24
 %if %{with ndb}
 %attr(755,root,root) %{_libdir}/libndbclient.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libndbclient.so.3
 %endif
 
+%if %{with default}
 %files -n mysql-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/bin/mysql_config
@@ -1201,6 +1192,7 @@ fi
 %if %{with ndb}
 %{_libdir}/libndbclient.a
 %endif
+%endif
 
 %if %{with ndb}
 %files ndb
@@ -1268,6 +1260,7 @@ fi
 %{_sysconfdir}/ld.so.conf.d/%{name}-router.conf
 %dir %{_libdir}/mysql/%{mysqlversion}/router
 %dir %{_libdir}/mysql/%{mysqlversion}/router/private
+%attr(750,root,root) %dir /var/lib/mysqlrouter/%{mysqlversion}
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/bin/mysqlrouter
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/bin/mysqlrouter_keyring
 %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/bin/mysqlrouter_passwd
@@ -1293,8 +1286,6 @@ fi
 %{_datadir}/mysql/%{mysqlversion}/man/man1/mysqlrouter.1*
 %{_datadir}/mysql/%{mysqlversion}/man/man1/mysqlrouter_passwd.1*
 %{_datadir}/mysql/%{mysqlversion}/man/man1/mysqlrouter_plugin_info.1*
-%attr(751,root,root) %dir /var/lib/mysqlrouter
-%attr(751,root,root) %dir /var/log/mysqlrouter
 %attr(750,mysqlrouter,mysqlrouter) %dir /var/log/mysqlrouter/%{mysqlversion}
 %attr(750,mysqlrouter,mysqlrouter) %dir /var/log/archive/mysqlrouter/%{mysqlversion}
 %attr(640,mysql,mysql) %ghost /var/log/mysqlrouter/%{mysqlversion}/*