From 6e17c080ef848bb7f000cd7085249d631d65e912 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Thu, 30 Nov 2023 21:57:27 +0100
Subject: [PATCH] SPECfile enhancement - Make the 'mariadb-errmsg' and
 'mariadb-common' sub-packages 'noarch'

The sub-package 'mariadb-common' contains XML files with character sets
The sub-package 'mariadb-errmsg' contains 'errmsg.sys' files with error messages for various laguages
---
 community-mysql.spec | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/community-mysql.spec b/community-mysql.spec
index 7236269..9ca53e2 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -195,7 +195,7 @@ BuildRequires:    make
 BuildRequires:    libfido2-devel
 
 Requires:         bash coreutils grep
-Requires:         %{name}-common%{?_isa} = %{sameevr}
+Requires:         %{name}-common = %{sameevr}
 
 Provides:         bundled(boost) = %{boost_bundled_version}
 
@@ -218,7 +218,7 @@ contains the standard MySQL client programs and generic MySQL files.
 %if %{with clibrary}
 %package          libs
 Summary:          The shared libraries required for MySQL clients
-Requires:         %{name}-common%{?_isa} = %{sameevr}
+Requires:         %{name}-common = %{sameevr}
 %if %{with mysql_names}
 Provides:         mysql-libs = %{sameevr}
 Provides:         mysql-libs%{?_isa} = %{sameevr}
@@ -247,6 +247,7 @@ package itself.
 %if %{with common}
 %package          common
 Summary:          The shared files required for MySQL server and client
+BuildArch:        noarch
 Requires:         %{_sysconfdir}/my.cnf
 
 %description      common
@@ -259,7 +260,8 @@ MySQL package.
 %if %{with errmsg}
 %package          errmsg
 Summary:          The error messages files required by MySQL server
-Requires:         %{name}-common%{?_isa} = %{sameevr}
+BuildArch:        noarch
+Requires:         %{name}-common = %{sameevr}
 
 %description      errmsg
 The package provides error messages files for the MySQL daemon
@@ -273,10 +275,10 @@ Summary:          The MySQL server and related files
 Suggests:         %{name}%{?_isa} = %{sameevr}
 Requires:         mysql%{?_isa}
 
-Requires:         %{name}-common%{?_isa} = %{sameevr}
+Requires:         %{name}-common = %{sameevr}
 Requires:         %{_sysconfdir}/my.cnf
 Requires:         %{_sysconfdir}/my.cnf.d
-Requires:         %{name}-errmsg%{?_isa} = %{sameevr}
+Requires:         %{name}-errmsg = %{sameevr}
 %{?mecab:Requires: mecab-ipadic}
 Requires:         coreutils
 Requires(pre):    /usr/sbin/useradd
@@ -330,7 +332,7 @@ developing MySQL client applications.
 %package          test
 Summary:          The test suite distributed with MySQL
 Requires:         %{name}%{?_isa} = %{sameevr}
-Requires:         %{name}-common%{?_isa} = %{sameevr}
+Requires:         %{name}-common = %{sameevr}
 Requires:         %{name}-server%{?_isa} = %{sameevr}
 Requires:         gzip
 Requires:         lz4
@@ -704,6 +706,7 @@ fi
 
 %if %{with clibrary}
 %files libs
+%dir %{_libdir}/mysql
 %{_libdir}/mysql/libmysqlclient*.so.*
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/*
 %endif
@@ -721,7 +724,6 @@ fi
 %license LICENSE
 %doc README README.mysql-license README.mysql-docs
 %doc storage/innobase/COPYING.Percona storage/innobase/COPYING.Google
-%dir %{_libdir}/mysql
 %dir %{_datadir}/%{pkg_name}
 %{_datadir}/%{pkg_name}/charsets
 %endif
@@ -785,6 +787,7 @@ fi
 %dir %{_datadir}/%{pkg_name}
 %endif
 
+%dir %{_libdir}/mysql
 %dir %{_libdir}/mysql/plugin
 %{_libdir}/mysql/plugin/adt_null.so
 %{_libdir}/mysql/plugin/auth_socket.so
@@ -863,6 +866,7 @@ fi
 %exclude %{_bindir}/mysql_config_editor
 %{_includedir}/mysql
 %{_datadir}/aclocal/mysql.m4
+%dir %{_libdir}/mysql
 %if %{with clibrary}
 %{_libdir}/mysql/libmysqlclient.so
 %endif
@@ -883,6 +887,7 @@ fi
 %attr(-,mysql,mysql) %{_datadir}/mysql-test
 %{_mandir}/man1/zlib_decompress.1*
 
+%dir %{_libdir}/mysql
 %dir %{_libdir}/mysql/plugin
 %{_libdir}/mysql/plugin/auth.so
 %{_libdir}/mysql/plugin/auth_test_plugin.so