Skip to content

Commit e2f91f4

Browse files
committed
MDEV-38771 RPM conflicts between MariaDB-common and mysql-common
mysql-common and MariaDB-common don't install the same files. mysql-common (in MySQL 8.0) installs character set files (/usr/share/mysql/charsets/*) and /usr/lib64/mysql (directory only). MariaDB common installs character set files in /usr/share/mariadb and the same /usr/lib64/mysql directory along with client plugins in /usr/lib64/mysql/plugin. The RPM rules of conflict only will cause troubles on directories if they are installed with different metatadata (selinux, ownership, permissions) which isn't the case. As the character sets are at a different location MariaDB-common isn't obsoleting mysql-common in a way that provides compatibilty with mysql-common, for mysql-libs or otherwise, so its just creating an install conflict. Users installing perl-DBD-MySQL notice this because its mysql-libs dependency pulls mysql-common, which conflicts with MariaDB-common. We correct by removing the conflict and the provides of MariaDB-common with resepect to mysql-common.
1 parent 09eeaa7 commit e2f91f4

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

cmake/cpack_rpm.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,6 @@ SETA(CPACK_RPM_client_PACKAGE_REQUIRES
230230

231231
SETA(CPACK_RPM_common_PACKAGE_CONFLICTS
232232
"MariaDB-server < 10.6.1")
233-
SETA(CPACK_RPM_common_PACKAGE_OBSOLETES
234-
"mysql-common")
235-
SETA(CPACK_RPM_common_PACKAGE_PROVIDES
236-
"mysql-common")
237233

238234
SETA(CPACK_RPM_devel_PACKAGE_OBSOLETES
239235
"MySQL-devel")

0 commit comments

Comments
 (0)