diff --git a/community-mysql.spec b/community-mysql.spec index afabf90..ccd9345 100644 --- a/community-mysql.spec +++ b/community-mysql.spec @@ -70,13 +70,13 @@ # Obsolete the package 'community-mysql' and all its sub-packages %bcond obsoletes_community_mysql 1 # This is the last version of the 'community-mysql' package production release -%global obsolete_community_mysql_version 8.0.35-1 - +%global obsolete_community_mysql_version 8.0.35-4 +%global community_mysql_version 8.0.36 # Make long macros shorter %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} -Name: community-mysql +Name: mysql8.0 Version: 8.0.35 Release: 100%{?with_debug:.debug}%{?dist} Summary: MySQL client programs and shared libraries @@ -210,7 +210,8 @@ Provides: bundled(boost) = %{boost_bundled_version} %{?with_conflicts_mariadb:Conflicts: mariadb} # Explicitly disallow installation of mysql + mariadb-server %{?with_conflicts_mariadb:Conflicts: mariadb-server} -%{?with_provides_community_mysql:Provides: community-mysql} +%{?with_provides_community_mysql:Provides: community-mysql = %community_mysql_version} +%{?with_provides_community_mysql:Provides: community-mysql%{?_isa} = %community_mysql_version} %{?with_obsoletes_community_mysql:Obsoletes: community-mysql <= %obsolete_community_mysql_version} %description @@ -224,7 +225,8 @@ contains the standard MySQL client programs and generic MySQL files. %package libs Summary: The shared libraries required for MySQL clients Requires: %{name}-common = %{sameevr} -%{?with_provides_community_mysql:Provides: community-mysql-libs} +%{?with_provides_community_mysql:Provides: community-mysql-libs = %community_mysql_version} +%{?with_provides_community_mysql:Provides: community-mysql-libs%{?_isa}= %community_mysql_version} %{?with_obsoletes_community_mysql:Obsoletes: community-mysql-libs <= %obsolete_community_mysql_version} %description libs @@ -238,7 +240,8 @@ MySQL server. %if %{with config} %package config Summary: The config files required by server and client -%{?with_provides_community_mysql:Provides: community-mysql-config} +%{?with_provides_community_mysql:Provides: community-mysql-config = %community_mysql_version} +%{?with_provides_community_mysql:Provides: community-mysql-config%{?_isa} = %community_mysql_version} %{?with_obsoletes_community_mysql:Obsoletes: community-mysql-config <= %obsolete_community_mysql_version} %description config @@ -254,7 +257,8 @@ package itself. Summary: The shared files required for MySQL server and client BuildArch: noarch Requires: %{_sysconfdir}/my.cnf -%{?with_provides_community_mysql:Provides: community-mysql-common} +%{?with_provides_community_mysql:Provides: community-mysql-common = %community_mysql_version} +%{?with_provides_community_mysql:Provides: community-mysql-common%{?_isa} = %community_mysql_version} %{?with_obsoletes_community_mysql:Obsoletes: community-mysql-common <= %obsolete_community_mysql_version} %description common @@ -269,7 +273,8 @@ MySQL package. Summary: The error messages files required by MySQL server BuildArch: noarch Requires: %{name}-common = %{sameevr} -%{?with_provides_community_mysql:Provides: community-mysql-errmsg} +%{?with_provides_community_mysql:Provides: community-mysql-errmsg = %community_mysql_version} +%{?with_provides_community_mysql:Provides: community-mysql-errmsg%{?_isa} = %community_mysql_version} %{?with_obsoletes_community_mysql:Obsoletes: community-mysql-errmsg <= %obsolete_community_mysql_version} %description errmsg @@ -309,7 +314,8 @@ Requires: (mysql-selinux if selinux-policy-targeted) %{?with_conflicts_mariadb:Conflicts: mariadb-server-galera} # Explicitly disallow installation of mysql + mariadb-server %{?with_conflicts_mariadb:Conflicts: mariadb} -%{?with_provides_community_mysql:Provides: community-mysql-server} +%{?with_provides_community_mysql:Provides: community-mysql-server = %community_mysql_version} +%{?with_provides_community_mysql:Provides: community-mysql-server%{?_isa} = %community_mysql_version} %{?with_obsoletes_community_mysql:Obsoletes: community-mysql-server <= %obsolete_community_mysql_version} %description server @@ -328,7 +334,8 @@ Requires: zlib-devel Requires: libzstd-devel %{?with_conflicts_mariadb:Conflicts: mariadb-devel} %{?with_conflicts_mariadb:Conflicts: mariadb-connector-c-devel} -%{?with_provides_community_mysql:Provides: community-mysql-devel} +%{?with_provides_community_mysql:Provides: community-mysql-devel = %community_mysql_version} +%{?with_provides_community_mysql:Provides: community-mysql-devel%{?_isa} = %community_mysql_version} %{?with_obsoletes_community_mysql:Obsoletes: community-mysql-devel <= %obsolete_community_mysql_version} %description devel @@ -365,7 +372,8 @@ Requires: perl(Test::More) Requires: perl(Time::HiRes) %{?with_conflicts_mariadb:Conflicts: mariadb-test} -%{?with_provides_community_mysql:Provides: community-mysql-test} +%{?with_provides_community_mysql:Provides: community-mysql-test = %community_mysql_version} +%{?with_provides_community_mysql:Provides: community-mysql-test%{?_isa} = %community_mysql_version} %{?with_obsoletes_community_mysql:Obsoletes: community-mysql-test <= %obsolete_community_mysql_version} %description test @@ -986,6 +994,9 @@ fi %endif %changelog +* Wed Jan 31 2024 Lukas Javorsky - 8.0.35-100 +- Renaming 'community-mysql' to 'mysql8.0' + * Wed Jan 31 2024 Pete Walter - 8.0.35-5 - Rebuild for ICU 74