diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-19 21:40:25 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-19 21:40:25 +0100 |
| commit | d81d13f17761e9b0d20e05241dfee7c4486a2fc8 (patch) | |
| tree | d482f2d55e7b84d0ecfbd52e136f8fcb47b74fc7 /cmake/cpack_rpm.cmake | |
| parent | de8f29bd3adbb062805fac220b04788fb38f4c2e (diff) | |
| download | mariadb-git-d81d13f17761e9b0d20e05241dfee7c4486a2fc8.tar.gz | |
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.
Diffstat (limited to 'cmake/cpack_rpm.cmake')
| -rw-r--r-- | cmake/cpack_rpm.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
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 |