diff options
author | Sergei Golubchik <sergii@pisem.net> | 2012-10-27 15:05:01 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-27 15:05:01 +0200 |
commit | 32b70aeadfec2679abe15cce78fa7b61968e66b6 (patch) | |
tree | c89236f7e4d80c723a9ad29a147773a3ddabe274 /cmake | |
parent | b84e5a4e8f516e23cfde13edf4e171be19f0f828 (diff) | |
download | mariadb-git-32b70aeadfec2679abe15cce78fa7b61968e66b6.tar.gz |
RPM fixes:
shared should provide libmysqlclient.so.18(libmysqlclient_16) too
don't "use DBD::mysql" explicitly in mytop
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/cpack_rpm.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index e915e732612..fdbe489116d 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -86,7 +86,7 @@ SET(CPACK_RPM_server_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files SET(CPACK_RPM_server_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-postin.sh) SET(CPACK_RPM_shared_PACKAGE_OBSOLETES "mysql-shared MySQL-shared-standard MySQL-shared-pro MySQL-shared-pro-cert MySQL-shared-pro-gpl MySQL-shared-pro-gpl-cert MySQL-shared MySQL-OurDelta-shared") -SET(CPACK_RPM_shared_PACKAGE_PROVIDES "MariaDB-shared MySQL-shared mysql-shared libmysqlclient.so.${SHARED_LIB_MAJOR_VERSION} libmysqlclient.so.${SHARED_LIB_MAJOR_VERSION}(libmysqlclient_${SHARED_LIB_MAJOR_VERSION}) libmysqlclient_r.so.${SHARED_LIB_MAJOR_VERSION} libmysqlclient_r.so.${SHARED_LIB_MAJOR_VERSION}(libmysqlclient_${SHARED_LIB_MAJOR_VERSION})") +SET(CPACK_RPM_shared_PACKAGE_PROVIDES "MariaDB-shared MySQL-shared mysql-shared libmysqlclient.so.18 libmysqlclient.so.18(libmysqlclient_16) libmysqlclient.so.18(libmysqlclient_18) libmysqlclient_r.so.18 libmysqlclient_r.so.18(libmysqlclient_18)") SET(CPACK_RPM_shared_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/shared-post.sh) SET(CPACK_RPM_shared_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/shared-post.sh) |