From d81d13f17761e9b0d20e05241dfee7c4486a2fc8 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 19 Feb 2014 21:40:25 +0100 Subject: [PATCH] MDEV-5390 doesn't install on fedora if mysql is installed, part 2 On fedora: 1. provide/obsoleve mariadb-* packages 2. MariaDB-common conflicts with mariadb-libs (on filesystem level), but does not provide or obsolete it. --- cmake/cpack_rpm.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 826ca7868e8..03c6a03a3ed 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -180,8 +180,14 @@ ELSEIF(RPM MATCHES "(rhel|centos)6") ALTERNATIVE_NAME("shared" "mysql-libs") ELSEIF(RPM MATCHES "fedora") SET(epoch 1) # this is fedora + ALTERNATIVE_NAME("client" "mariadb") ALTERNATIVE_NAME("client" "mysql") + ALTERNATIVE_NAME("devel" "mariadb-devel") + ALTERNATIVE_NAME("server" "mariadb-server") + ALTERNATIVE_NAME("shared" "mariadb-libs") ALTERNATIVE_NAME("shared" "mysql-libs") + ALTERNATIVE_NAME("test" "mariadb-test") + SET(CPACK_RPM_common_PACKAGE_CONFLICTS "mariadb-libs < 1:%{version}-%{release}") ENDIF() # workaround for lots of perl dependencies added by rpmbuild