From 0ec924002888db18098d3b2e39b41687158cfe78 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Wed, 15 Jan 2025 04:47:03 +0100
Subject: [PATCH] [2/3] Code adjustments for RHEL 9.6 - Start bundling ZLIB

The ZLIB version in RHEL 9.6 is too old for the MySQL 8.4.3
---
 mysql.spec | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/mysql.spec b/mysql.spec
index 4541527..3a27fdf 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -33,6 +33,10 @@ ExcludeArch: %{ix86}
 
 %global boost_bundled_version 1.84.0
 
+# MySQL 8.4.3 on RHEL 9.6:
+#  ZLIB version must be at least 1.2.13, found 1.2.11.
+%global zlib_bundled_version 1.3.1
+
 
 # For some use cases we do not need some parts of the package
 %bcond clibrary 1
@@ -184,7 +188,6 @@ BuildRequires:    perl-generators
 BuildRequires:    rpcgen
 BuildRequires:    libtirpc-devel
 BuildRequires:    protobuf-lite-devel
-BuildRequires:    zlib-devel
 BuildRequires:    multilib-rpm-config
 # Tests requires time and ps and some perl modules
 BuildRequires:    procps
@@ -243,6 +246,9 @@ Requires:         %{pkgname}-common = %{sameevr}
 # See https://bugzilla.redhat.com/show_bug.cgi?id=2260138#c7 for details
 Provides:         bundled(boost) = %{boost_bundled_version}
 
+# ZLIB version in RHEL 9 is too low
+Provides:         bundled(zlib) = %{zlib_bundled_version}
+
 # 'rapidjson' library must be bundled
 # The rapidjson upstream made the last release in 2016, even though it has an active development till today (2024, ~750 commits since)
 # The MySQL upstream forked the project from a specific commit and added custom patches. See "extra/RAPIDJSON-README" for details.
@@ -434,7 +440,6 @@ the MySQL server and some accompanying files and directories.
 Summary:          Files for development of MySQL applications
 %{?with_clibrary:Requires:         %{pkgname}-libs%{?_isa} = %{sameevr}}
 Requires:         openssl-devel
-Requires:         zlib-devel
 Requires:         libzstd-devel
 %{?with_conflicts_mariadb:Conflicts: mariadb-devel}
 %{?with_conflicts_mariadb:Conflicts: mariadb-connector-c-devel}
@@ -530,7 +535,6 @@ rm -r extra/libedit
 rm -r extra/libfido2
 rm -r extra/protobuf
 rm -r extra/tirpc
-rm -r extra/zlib
 rm -r extra/zstd
 # Three files from the lz4 bundle tree are still needed.
 # They are the 'xxhash' library with custom extension to it.
@@ -612,7 +616,7 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
 %endif
          -DWITH_ROUTER=OFF \
          -DWITH_SYSTEM_LIBS=ON \
-         -DWITH_ZLIB=system \
+         -DWITH_ZLIB=bundled \
          -DWITH_RAPIDJSON=bundled \
          -DWITH_MECAB=system \
          -DWITH_FIDO=%{?with_fido:system}%{!?with_fido:none} \