From 6cd7eae323679b19065981465a2ba21f88385e67 Mon Sep 17 00:00:00 2001
From: Lars Tangvald <lars.tangvald@oracle.com>
Date: Tue, 30 Apr 2024 09:30:36 +0200
Subject: [PATCH] Upgrade to MySQL 8.0.37

---
 mysql8.0.spec | 10 ++++++----
 sources       |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mysql8.0.spec b/mysql8.0.spec
index c2720c6..db2c9da 100644
--- a/mysql8.0.spec
+++ b/mysql8.0.spec
@@ -1,6 +1,6 @@
 # Name of the package without any prefixes
 %global majorname mysql
-%global package_version 8.0.36
+%global package_version 8.0.37
 %define majorversion %(echo %{package_version} | cut -d'.' -f1-2 )
 %global pkgnamepatch mysql
 
@@ -84,7 +84,7 @@
 
 Name:             %{majorname}%{majorversion}
 Version:          %{package_version}
-Release:          5%{?with_debug:.debug}%{?dist}
+Release:          1%{?with_debug:.debug}%{?dist}
 Summary:          MySQL client programs and shared libraries
 URL:              http://www.mysql.com
 
@@ -503,7 +503,6 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
 # so we can't use %%{_datadir} and so forth here.
 %cmake \
          -DBUILD_CONFIG=mysql_release \
-         -DFEATURE_SET="community" \
          -DINSTALL_LAYOUT=RPM \
          -DDAEMON_NAME="%{daemon_name}" \
          -DDAEMON_NO_PREFIX="%{daemon_no_prefix}" \
@@ -551,7 +550,6 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
 %{?with_debug: -DWITH_DEBUG=1} \
 %{?with_debug: -DMYSQL_MAINTAINER_MODE=0} \
          -DTMPDIR=/var/tmp \
-         -DWITH_MYSQLD_LDFLAGS="%{build_ldflags}" \
          -DCMAKE_C_LINK_FLAGS="%{build_ldflags}" \
          -DCMAKE_CXX_LINK_FLAGS="%{build_ldflags}" \
          -DCMAKE_SKIP_INSTALL_RPATH=YES \
@@ -1051,6 +1049,10 @@ fi
 %endif
 
 %changelog
+* Thu Apr 18 2024 Lars Tangvald <lars.tangvald@oracle.com> - 8.0.37-1
+- Update to MySQL 8.0.37
+- Remove some legacy cmake options
+
 * Tue Apr 16 2024 Michal Schorm <mschorm@redhat.com> - 8.0.36-5
 - Fix my.cnf dependency for Flatpak builds
 
diff --git a/sources b/sources
index 33f2876..77e33ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mysql-boost-8.0.36.tar.gz) = a6c1c009a322b7e7aa2aa607573060414c847c77d48f44a24058ffb89673621f2ebbcc1a4448fa841a87ff721159cc8eaf44a57721c7dc233c130691c16a9d4a
+SHA512 (mysql-boost-8.0.37.tar.gz) = 4c6033d4f96990d3f324f0d5733273425ddf7cc11660e110e0dc848da6cfa47b7565c1eb0b5d1e08878a0ea2c7d1eb85b400ccca28e5b4383f7e9216ba3e1660