Remove 'static' library subpackage. mysql-connector-odbc now supports dynamic linking again.

This commit is contained in:
Michal Schorm 2018-02-17 14:05:48 +01:00
parent 6db585e11b
commit 93c629b9e6

View File

@ -394,17 +394,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
@ -599,12 +588,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
@ -812,9 +798,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
@ -994,6 +977,7 @@ fi
%changelog
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.21-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
- Removed 'static' library subpackage
* Sun Jan 21 2018 Norvald H. Ryeng <norvald.ryeng@oracle.com> - 5.7.21-1
- Update to MySQL 5.7.21, for various fixes described at