diff --git a/mysql.spec b/mysql.spec index 6df10a32a90df92183f3626cf96c01c070b6f4d8..e6a5cb7357289b8639d50ddfe2d785b21d6ffaf7 100644 --- a/mysql.spec +++ b/mysql.spec @@ -30,7 +30,7 @@ %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: mysql Version: 8.0.35 -Release: 1 +Release: 2 Summary: MySQL client programs and shared libraries URL: http://www.mysql.com License: GPLv2 with exceptions and LGPLv2 and BSD @@ -81,7 +81,7 @@ BuildRequires: perl(Getopt::Long) perl(if) perl(IO::File) perl(IO::Handle) BuildRequires: perl(IO::Socket::INET) perl(IPC::Open3) perl(JSON) perl(lib) perl(LWP::Simple) BuildRequires: perl(Memoize) perl(Net::Ping) perl(POSIX) perl(Socket) perl(strict) BuildRequires: perl(Sys::Hostname) perl(Test::More) perl(Time::HiRes) perl(Time::localtime) -BuildRequires: perl(warnings) systemd m4 +BuildRequires: perl(warnings) systemd m4 chrpath Requires: bash coreutils grep %{name}-common%{?_isa} = %{sameevr} Provides: bundled(boost) = %{boost_bundled_version} %if %{with mysql_names} @@ -127,7 +127,7 @@ package itself. %package common Summary: The shared files required for MySQL server and client -Requires: %{_sysconfdir}/my.cnf +Requires: %{name}-config = %{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 @@ -146,7 +146,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: %{name}-common%{?_isa} = %{sameevr} %{name}-config = %{sameevr} Requires: %{_sysconfdir}/my.cnf.d %{name}-errmsg%{?_isa} = %{sameevr} %{?mecab:Requires: mecab-ipadic} Requires: coreutils @@ -387,6 +387,7 @@ chmod 644 %{buildroot}%{logrotateddir}/%{daemon_name} mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d echo "%{_libdir}/mysql" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf mv %{buildroot}%{_bindir}/mysqld %{buildroot}%{_libexecdir}/mysqld +chrpath -d %{buildroot}%{_libexecdir}/mysqld mkdir -p %{buildroot}%{_sbindir} ln -s %{_libexecdir}/mysqld %{buildroot}%{_sbindir}/mysqld @@ -543,6 +544,9 @@ fi %{_mandir}/man1/mysql_config.1* %changelog +* Wed Dec 13 2023 Ge Wang - 8.0.35-2 +- Remove rpath to fix euler maker build failure + * Tue Nov 07 2023 yaoxin - 8.0.35-1 - Upgrade to 8.0.35 for fix cves