From 784581a853cb63b528fb6f2094402ecbe8ae0f4d Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Wed, 12 Aug 2020 08:40:13 +0200 Subject: [PATCH] Check that we have correct versions in bundled(*) Provides --- community-mysql.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/community-mysql.spec b/community-mysql.spec index 044efa6..a385530 100644 --- a/community-mysql.spec +++ b/community-mysql.spec @@ -39,6 +39,8 @@ # For deep debugging we need to build binaries with extra debug info %bcond_with debug +%global boost_bundled_version 1.72.0 + # Include files for systemd %global daemon_name mysqld %global daemon_no_prefix mysqld @@ -67,7 +69,7 @@ Name: community-mysql Version: 8.0.21 -Release: 4%{?with_debug:.debug}%{?dist} +Release: 5%{?with_debug:.debug}%{?dist} Summary: MySQL client programs and shared libraries URL: http://www.mysql.com @@ -189,7 +191,8 @@ BuildRequires: systemd Requires: bash coreutils grep Requires: %{name}-common%{?_isa} = %{sameevr} -Provides: bundled(boost) = 1.69 +Provides: bundled(boost) = %{boost_bundled_version} + %if %{with mysql_names} Provides: mysql = %{sameevr} @@ -379,7 +382,7 @@ the MySQL sources. %patch76 -p1 # Patch Boost -pushd boost/boost_1_??_0 +pushd boost/boost_$(echo %{boost_bundled_version}| tr . _) %patch115 -p0 %patch125 -p1 popd @@ -867,6 +870,9 @@ fi %endif %changelog +* Wed Aug 12 2020 Honza Horak - 8.0.21-5 +- Check that we have correct versions in bundled(*) Provides + * Thu Aug 06 2020 Jeff Law - 8.0.21-4 - Disable LTO