From 74f555580084bc4425baa80726a9ff20e0ef2b09 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Sat, 17 Feb 2018 14:05:48 +0100 Subject: [PATCH] Remove 'static' library subpackage. mysql-connector-odbc now supports dynamic linking again. --- community-mysql.spec | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/community-mysql.spec b/community-mysql.spec index 7fb41c7..282686a 100644 --- a/community-mysql.spec +++ b/community-mysql.spec @@ -388,17 +388,6 @@ the MySQL sources. %endif -%package static -Summary: Static mysql client library -Suggests: %{name}-devel%{?_isa} = %{sameevr} - -%description static -MySQL is a multi-user, multi-threaded SQL database server. -This package contains the static client library "libmysqlclient.a", that is -required by mysql-connector-odbc package. This package should not be required -by any other package than mysql-connector-odbc. - - %prep %setup -q -n mysql-%{version} %patch1 -p1 @@ -592,12 +581,9 @@ install -D -p -m 0644 scripts/server.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/%{p mv %{buildroot}%{_datadir}/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir} ln -s ../../../../../bin/my_safe_process %{buildroot}%{_datadir}/mysql-test/lib/My/SafeProcess/my_safe_process -# Do not pack those libraries -rm %{buildroot}%{_libdir}/mysql/libmysqld.a -rm %{buildroot}%{_libdir}/mysql/libmysqlservices.a - # not needed in rpm package rm %{buildroot}%{_bindir}/mysql_embedded +rm %{buildroot}%{_libdir}/mysql/*.a rm %{buildroot}%{_datadir}/%{pkg_name}/magic rm %{buildroot}%{_datadir}/%{pkg_name}/mysql.server rm %{buildroot}%{_datadir}/%{pkg_name}/mysqld_multi.server @@ -805,9 +791,6 @@ fi %config(noreplace) %{_sysconfdir}/ld.so.conf.d/* %endif -%files static -%{_libdir}/mysql/libmysqlclient.a - %if %{with config} %files config # although the default my.cnf contains only server settings, we put it in the @@ -985,6 +968,9 @@ fi %endif %changelog +* Sat Feb 17 2018 Michal Schorm - 5.7.21-1 +- Removed 'static' library subpackage + * Sun Jan 21 2018 Norvald H. Ryeng - 5.7.21-1 - Update to MySQL 5.7.21, for various fixes described at https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-21.html