summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2020-10-30 12:11:43 +0100
committerSergei Golubchik <serg@mariadb.org>2020-10-30 12:11:43 +0100
commitea5319a0813345e9ee1a11d36d66053dca34711f (patch)
tree7d97156e39c80a91f1655e8d5a545f7b5d12d3e7
parent9443b4c64e7b9c782d1c95d57d243ec5a8ea6c7f (diff)
downloadmariadb-git-ea5319a0813345e9ee1a11d36d66053dca34711f.tar.gz
-rw-r--r--cmake/cpack_rpm.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
index 1802fa28141..77971f8bf7b 100644
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@ -223,7 +223,7 @@ IF(RPM MATCHES "(rhel|centos)5")
ALTERNATIVE_NAME("shared" "mysql")
ELSEIF(RPM MATCHES "(rhel|centos)6")
ALTERNATIVE_NAME("client" "mysql")
- ALTERNATIVE_NAME("shared" "mysql-libs")
+ ALTERNATIVE_NAME("shared" "mysql-libs" 5.6.50)
ELSEIF(RPM MATCHES "fedora" OR RPM MATCHES "(rhel|centos)7")
SET(epoch 1:) # this is fedora
ALTERNATIVE_NAME("client" "mariadb")
@@ -232,7 +232,7 @@ ELSEIF(RPM MATCHES "fedora" OR RPM MATCHES "(rhel|centos)7")
ALTERNATIVE_NAME("server" "mariadb-server")
ALTERNATIVE_NAME("server" "mysql-compat-server")
ALTERNATIVE_NAME("shared" "mariadb-libs")
- ALTERNATIVE_NAME("shared" "mysql-libs")
+ ALTERNATIVE_NAME("shared" "mysql-libs" 5.6.50)
ALTERNATIVE_NAME("test" "mariadb-test")
SET(CPACK_RPM_common_PACKAGE_CONFLICTS "mariadb-libs < 1:%{version}-%{release}")
ELSEIF(RPM MATCHES "sles")