diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-23 22:34:03 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-23 22:34:03 +0200 |
| commit | 78f58792ac4517614fbe7b19e541ad7107a43c99 (patch) | |
| tree | 837ce1417574dc1f9707c12e460d8d5e546f7839 /cmake/cpack_rpm.cmake | |
| parent | deafe7a7aa8d00d1a8ce150292b9aa8fb4570107 (diff) | |
| download | mariadb-git-78f58792ac4517614fbe7b19e541ad7107a43c99.tar.gz | |
more adequate rpm settings
new MariaDB-shared no longer provides or replaces mysql-libs or mariadb-libs
Diffstat (limited to 'cmake/cpack_rpm.cmake')
| -rw-r--r-- | cmake/cpack_rpm.cmake | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index c46849eb4ef..88e4e06c743 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -188,11 +188,8 @@ ALTERNATIVE_NAME("test" "mysql-test") # Argh! Different distributions call packages differently, to be a drop-in # replacement we have to fake distribution-speficic dependencies -IF(RPM MATCHES "(rhel|centos)5") - ALTERNATIVE_NAME("shared" "mysql") -ELSEIF(RPM MATCHES "(rhel|centos)6") +IF(RPM MATCHES "(rhel|centos)6") ALTERNATIVE_NAME("client" "mysql") - ALTERNATIVE_NAME("shared" "mysql-libs") ELSEIF(RPM MATCHES "fedora" OR RPM MATCHES "(rhel|centos)7") SET(epoch 1) # this is fedora ALTERNATIVE_NAME("client" "mariadb") @@ -200,8 +197,6 @@ ELSEIF(RPM MATCHES "fedora" OR RPM MATCHES "(rhel|centos)7") ALTERNATIVE_NAME("devel" "mariadb-devel") ALTERNATIVE_NAME("server" "mariadb-server") ALTERNATIVE_NAME("server" "mysql-compat-server") - ALTERNATIVE_NAME("shared" "mariadb-libs") - ALTERNATIVE_NAME("shared" "mysql-libs") ALTERNATIVE_NAME("test" "mariadb-test") ENDIF() |