From 221c8d2b92e1c5cc1ba4af03e7240830075874af Mon Sep 17 00:00:00 2001 From: xiejing Date: Thu, 22 Feb 2024 16:15:23 +0800 Subject: [PATCH] fix requires to mysql-config instead of my.cnf file --- my.cnf.in | 2 +- mysql.spec | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/my.cnf.in b/my.cnf.in index 2bb9e88..2dffea7 100644 --- a/my.cnf.in +++ b/my.cnf.in @@ -1,5 +1,5 @@ # -# This group is read both both by the client and the server +# This group is read both by the client and the server # use it for options that affect everything # [client-server] diff --git a/mysql.spec b/mysql.spec index b9489c9..b23c9ed 100644 --- a/mysql.spec +++ b/mysql.spec @@ -30,7 +30,7 @@ %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: mysql Version: 8.0.28 -Release: 4 +Release: 5 Summary: MySQL client programs and shared libraries URL: http://www.mysql.com License: GPLv2 with exceptions and LGPLv2 and BSD @@ -126,7 +126,7 @@ package itself. %package common Summary: The shared files required for MySQL server and client -Requires: %{_sysconfdir}/my.cnf +Requires: %{name}-config%{?_isa} = %{sameevr} %description common The mysql-common package provides the essential shared files for any MySQL program. You will need to install this package to use any other @@ -145,8 +145,7 @@ The package provides error messages files for the MySQL daemon Summary: The MySQL server and related files Suggests: %{name}%{?_isa} = %{sameevr} Requires: mysql%{?_isa} -Requires: %{name}-common%{?_isa} = %{sameevr} %{_sysconfdir}/my.cnf -Requires: %{_sysconfdir}/my.cnf.d %{name}-errmsg%{?_isa} = %{sameevr} +Requires: %{name}-common%{?_isa} = %{sameevr} %{name}-errmsg%{?_isa} = %{sameevr} %{?mecab:Requires: mecab-ipadic} Requires: coreutils Requires(pre): /usr/sbin/useradd @@ -542,6 +541,9 @@ fi %{_mandir}/man1/mysql_config.1* %changelog +* Thu Feb 22 2024 xiejing - 8.0.28-5 +- fix requires to mysql-config instead of my.cnf file + * Fri Nov 10 2023 haomimi - 8.0.28-4 - fix Failed to start mysqld.service @@ -615,4 +617,4 @@ fi - add fstack-protector-strong * Fri Feb 28 2020 catastrowings 8.0.17-2 -- openEuler package init. \ No newline at end of file +- openEuler package init. -- Gitee