summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-11-07 13:22:27 +0100
committerSergei Golubchik <sergii@pisem.net>2013-11-07 13:22:27 +0100
commitd1f2ba398585e46bc93203c04f684a59f9777f8a (patch)
treeba75d448250e90d36c79f4d0957d4bfa859221c2 /cmake
parent0c6a40f2d5c2c3791455b5ef761f8dd034851df0 (diff)
downloadmariadb-git-d1f2ba398585e46bc93203c04f684a59f9777f8a.tar.gz
MDEV-5250 doesn't install on fedora if mysql is installed
when our package is to replace "mysql", it has both provide and obsolete it
Diffstat (limited to 'cmake')
-rw-r--r--cmake/cpack_rpm.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
index c21b863c71f..a8439fcab00 100644
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@ -127,6 +127,8 @@ SET(CPACK_RPM_test_PACKAGE_PROVIDES "MySQL-test mysql-test")
MACRO(ALTERNATIVE_NAME real alt)
SET(p "CPACK_RPM_${real}_PACKAGE_PROVIDES")
SET(${p} "${${p}} ${alt} ${alt}(x86-32) ${alt}(x86-64) config(${alt})")
+ SET(o "CPACK_RPM_${real}_PACKAGE_OBSOLETES")
+ SET(${o} "${${o}} ${alt}")
ENDMACRO(ALTERNATIVE_NAME)
IF(RPM MATCHES "(rhel|centos)5")