Check that we have correct versions in bundled(*) Provides

This commit is contained in:
Honza Horak 2020-08-12 08:40:13 +02:00
parent 4d636e8bff
commit 784581a853

View File

@ -39,6 +39,8 @@
# For deep debugging we need to build binaries with extra debug info # For deep debugging we need to build binaries with extra debug info
%bcond_with debug %bcond_with debug
%global boost_bundled_version 1.72.0
# Include files for systemd # Include files for systemd
%global daemon_name mysqld %global daemon_name mysqld
%global daemon_no_prefix mysqld %global daemon_no_prefix mysqld
@ -67,7 +69,7 @@
Name: community-mysql Name: community-mysql
Version: 8.0.21 Version: 8.0.21
Release: 4%{?with_debug:.debug}%{?dist} Release: 5%{?with_debug:.debug}%{?dist}
Summary: MySQL client programs and shared libraries Summary: MySQL client programs and shared libraries
URL: http://www.mysql.com URL: http://www.mysql.com
@ -189,7 +191,8 @@ BuildRequires: systemd
Requires: bash coreutils grep Requires: bash coreutils grep
Requires: %{name}-common%{?_isa} = %{sameevr} Requires: %{name}-common%{?_isa} = %{sameevr}
Provides: bundled(boost) = 1.69 Provides: bundled(boost) = %{boost_bundled_version}
%if %{with mysql_names} %if %{with mysql_names}
Provides: mysql = %{sameevr} Provides: mysql = %{sameevr}
@ -379,7 +382,7 @@ the MySQL sources.
%patch76 -p1 %patch76 -p1
# Patch Boost # Patch Boost
pushd boost/boost_1_??_0 pushd boost/boost_$(echo %{boost_bundled_version}| tr . _)
%patch115 -p0 %patch115 -p0
%patch125 -p1 %patch125 -p1
popd popd
@ -867,6 +870,9 @@ fi
%endif %endif
%changelog %changelog
* Wed Aug 12 2020 Honza Horak <hhorak@redhat.com> - 8.0.21-5
- Check that we have correct versions in bundled(*) Provides
* Thu Aug 06 2020 Jeff Law <law@redhat.com> - 8.0.21-4 * Thu Aug 06 2020 Jeff Law <law@redhat.com> - 8.0.21-4
- Disable LTO - Disable LTO