From 9355f7e6a260b2b99af80f52fd0afa3cb08060ae Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Tue, 30 Jan 2024 13:26:24 +0000 Subject: [PATCH 1/4] Rebase to version 8.0.36 --- mysql8.0.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql8.0.spec b/mysql8.0.spec index 186e9da..8f420df 100644 --- a/mysql8.0.spec +++ b/mysql8.0.spec @@ -84,7 +84,7 @@ Name: %{majorname}%{majorversion} Version: %{package_version} -Release: 3%{?with_debug:.debug}%{?dist} +Release: 3%{?with_debug:.debug}.alternative%{?dist} Summary: MySQL client programs and shared libraries URL: http://www.mysql.com From fb8f54a7fa4a0ee13ba1918974a58779b189e9da Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Tue, 6 Feb 2024 21:14:02 +0100 Subject: [PATCH 2/4] Update to 8.3.0 to better test demodularized design --- mysql8.0.spec | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/mysql8.0.spec b/mysql8.0.spec index 8f420df..a7c4d7a 100644 --- a/mysql8.0.spec +++ b/mysql8.0.spec @@ -1,12 +1,12 @@ # Name of the package without any prefixes %global majorname mysql -%global package_version 8.0.36 +%global package_version 8.3.0 %define majorversion %(echo %{package_version} | cut -d'.' -f1-2 ) %global pkgnamepatch mysql # Set if this package will be the default one in distribution -%{!?mysql_default:%global mysql_default 1} +%{!?mysql_default:%global mysql_default 0} # Regression tests may take a long time (many cores recommended), skip them by # passing --nocheck to rpmbuild or by setting runselftest to 0 if defining @@ -19,7 +19,7 @@ # The last version on which the full testsuite has been run # In case of further rebuilds of that version, don't require full testsuite to be run # run only "main" suite -%global last_tested_version 8.0.35 +%global last_tested_version 8.3.0 # Set to 1 to force run the testsuite even if it was already tested in current version %global force_run_testsuite 0 @@ -126,7 +126,7 @@ Patch51: %{pkgnamepatch}-sharedir.patch Patch52: %{pkgnamepatch}-rpath.patch Patch53: %{pkgnamepatch}-mtr.patch Patch54: %{pkgnamepatch}-arm32-timer.patch -Patch55: %{pkgnamepatch}-c99.patch +#Patch55: %%{pkgnamepatch}-c99.patch Patch56: %{pkgnamepatch}-flush-logrotate.patch # Patches taken from boost 1.59 @@ -450,7 +450,7 @@ the MySQL sources. %patch -P52 -p1 %patch -P53 -p1 %patch -P54 -p1 -%patch -P55 -p1 +#%%patch -P55 -p1 %patch -P56 -p1 # Patch Boost @@ -882,10 +882,10 @@ fi %{_libdir}/mysql/plugin/group_replication.so %{_libdir}/mysql/plugin/ha_example.so %{_libdir}/mysql/plugin/ha_mock.so -%{_libdir}/mysql/plugin/innodb_engine.so +#%%{_libdir}/mysql/plugin/innodb_engine.so %{_libdir}/mysql/plugin/keyring_file.so %{_libdir}/mysql/plugin/keyring_udf.so -%{_libdir}/mysql/plugin/libmemcached.so +#%%{_libdir}/mysql/plugin/libmemcached.so %{_libdir}/mysql/plugin/libpluginmecab.so %{_libdir}/mysql/plugin/locking_service.so %{_libdir}/mysql/plugin/mypluglib.so @@ -955,6 +955,7 @@ fi %{_bindir}/mysql_keyring_encryption_test %{_bindir}/mysqltest %{_bindir}/mysqltest_safe_process +%{_bindir}/mysql_test_event_tracking %{_bindir}/mysqlxtest %{_bindir}/mysqld_safe %{_bindir}/comp_err @@ -976,6 +977,12 @@ fi %{_libdir}/mysql/plugin/component_test_audit_api_message.so %{_libdir}/mysql/plugin/component_test_backup_lock_service.so %{_libdir}/mysql/plugin/component_test_component_deinit.so +%{_libdir}/mysql/plugin/component_test_event_tracking_consumer.so +%{_libdir}/mysql/plugin/component_test_event_tracking_consumer_a.so +%{_libdir}/mysql/plugin/component_test_event_tracking_consumer_b.so +%{_libdir}/mysql/plugin/component_test_event_tracking_consumer_c.so +%{_libdir}/mysql/plugin/component_test_event_tracking_producer_a.so +%{_libdir}/mysql/plugin/component_test_event_tracking_producer_b.so %{_libdir}/mysql/plugin/component_test_host_application_signal.so %{_libdir}/mysql/plugin/component_test_mysql_command_services.so %{_libdir}/mysql/plugin/component_test_mysql_current_thread_reader.so @@ -985,6 +992,7 @@ fi %{_libdir}/mysql/plugin/component_test_pfs_notification.so %{_libdir}/mysql/plugin/component_test_pfs_resource_group.so %{_libdir}/mysql/plugin/component_test_sensitive_system_variables.so +%{_libdir}/mysql/plugin/component_test_server_telemetry_metrics.so %{_libdir}/mysql/plugin/component_test_server_telemetry_traces.so %{_libdir}/mysql/plugin/component_test_status_var_reader.so %{_libdir}/mysql/plugin/component_test_status_var_service_int.so From 0d3bdf1e42cc2c069672e6f847c92cdd487ba737 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Thu, 15 Feb 2024 12:49:12 +0100 Subject: [PATCH 3/4] Update sources to pre-release version --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 33f2876..dfdbc3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql-boost-8.0.36.tar.gz) = a6c1c009a322b7e7aa2aa607573060414c847c77d48f44a24058ffb89673621f2ebbcc1a4448fa841a87ff721159cc8eaf44a57721c7dc233c130691c16a9d4a +SHA512 (mysql-boost-8.3.0.tar.gz) = 3ab9c672fcf42caa639699ad1169f4297f53242abb0b88e533aa05872f6cee07dce9bafa812adb3162ed7d8bf5669bf350b6f0397f24117462589c5d334bd173 From 069cbbfe508f507b765ee829adcc8228d8361004 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Mon, 19 Feb 2024 16:31:09 +0100 Subject: [PATCH 4/4] Do not provide community-mysql* symbols if alternative When building the package as alternative (non default) version for a distro, we should not have provides that are virtual and without version. Otherwise, packages that depend on these virtual provides (like build requires of perl-DBD-MySQL), could install the non-default version by accident. --- mysql8.0.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mysql8.0.spec b/mysql8.0.spec index a7c4d7a..72975aa 100644 --- a/mysql8.0.spec +++ b/mysql8.0.spec @@ -72,9 +72,9 @@ # Provide explicitly the 'community-mysql' names # 'community-mysql' names are deprecated and to be removed in future Fedora # but we're leaving them here for compatibility reasons -%bcond provides_community_mysql 1 +%bcond provides_community_mysql %{?mysql_default} # Obsolete the package 'community-mysql' and all its sub-packages -%bcond obsoletes_community_mysql 1 +%bcond obsoletes_community_mysql %{?mysql_default} # This is the last version of the 'community-mysql' package production release %global obsolete_community_mysql_version 8.0.35-10 %global community_mysql_version 8.0.36-1 @@ -84,7 +84,7 @@ Name: %{majorname}%{majorversion} Version: %{package_version} -Release: 3%{?with_debug:.debug}.alternative%{?dist} +Release: 4%{?with_debug:.debug}.alternative%{?dist} Summary: MySQL client programs and shared libraries URL: http://www.mysql.com @@ -1060,6 +1060,9 @@ fi %endif %changelog +* Mon Feb 19 2024 Honza Horak - 8.0.36-4 +- Do not provide community-mysql* symbols if alternative + * Mon Feb 05 2024 Lukas Javorsky - 8.0.36-3 - Apply demodularization - the default stream builds mysql.rpm