summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-11-13 14:07:58 +0100
committerSergei Golubchik <sergii@pisem.net>2013-11-13 14:07:58 +0100
commitbdd883ed9a68ff1e82528cc6b33316d98894cfd2 (patch)
tree93081c72225d399ac93ae0d8bb301a13cfc9a50c /cmake
parent2cba9e0cdccfac6f93a54e2ba12eb9926cfaa0a1 (diff)
parentf3a78f392dad24391c19464731833e2bdf19bdef (diff)
downloadmariadb-git-bdd883ed9a68ff1e82528cc6b33316d98894cfd2.tar.gz
5.5. merge
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")