From 1de77ee1ade8937faa941a49e820179e61605ca4 Mon Sep 17 00:00:00 2001 From: Alexander Barkov <bar@mnogosearch.org> Date: Sun, 21 Apr 2013 22:15:33 +0400 Subject: [PATCH] Packaging clean-ups for the cassandra and connect engines. modified: @ storage/cassandra/CMakeLists.txt Renaming the package "CassandraSE" to "cassandra-engine", as agreed during Lisbon meeting. @ storage/connect/CMakeLists.txt Removing an unused line --- storage/cassandra/CMakeLists.txt | 15 +++++++-------- storage/connect/CMakeLists.txt | 1 - 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/storage/cassandra/CMakeLists.txt b/storage/cassandra/CMakeLists.txt index dbccc2eb127..5975246233e 100644 --- a/storage/cassandra/CMakeLists.txt +++ b/storage/cassandra/CMakeLists.txt @@ -48,21 +48,20 @@ IF(CASSANDRASE_OK) LINK_DIRECTORIES(${LINK_DIR}) - MYSQL_ADD_PLUGIN(cassandra ${cassandra_sources} STORAGE_ENGINE MODULE_ONLY LINK_LIBRARIES thrift COMPONENT CassandraSE) + MYSQL_ADD_PLUGIN(cassandra ${cassandra_sources} STORAGE_ENGINE MODULE_ONLY LINK_LIBRARIES thrift COMPONENT cassandra-engine) IF (INSTALL_SYSCONFDIR) INSTALL(FILES cassandra.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d - COMPONENT CassandraSE) + COMPONENT cassandra-engine) ENDIF(INSTALL_SYSCONFDIR) IF(RPM) - SET(CPACK_COMPONENT_CASSANDRASELIBRARIES_GROUP "CassandraSE" PARENT_SCOPE) - SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} CassandraSE PARENT_SCOPE) - SET(CPACK_RPM_CassandraSE_PACKAGE_REQUIRES "MariaDB-server" PARENT_SCOPE) + SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} cassandra-engine PARENT_SCOPE) + SET(CPACK_RPM_cassandra_engine_PACKAGE_REQUIRES "MariaDB-server" PARENT_SCOPE) # workarounds for cmake issues #13248 and #12864: - SET(CPACK_RPM_CassandraSE_USER_FILELIST ${ignored} "%config(noreplace) /etc/my.cnf.d/*" PARENT_SCOPE) - SET(CPACK_RPM_CassandraSE_PACKAGE_PROVIDES "cmake_bug_13248" PARENT_SCOPE) - SET(CPACK_RPM_CassandraSE_PACKAGE_OBSOLETES "cmake_bug_13248" PARENT_SCOPE) + SET(CPACK_RPM_cassandra_engine_USER_FILELIST ${ignored} "%config(noreplace) /etc/my.cnf.d/*" PARENT_SCOPE) + SET(CPACK_RPM_cassandra_engine_PACKAGE_PROVIDES "cmake_bug_13248" PARENT_SCOPE) + SET(CPACK_RPM_cassandra_engine_PACKAGE_OBSOLETES "cmake_bug_13248" PARENT_SCOPE) ENDIF(RPM) ENDIF(CASSANDRASE_OK) diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt index dbf08f13dad..63943aaa03b 100644 --- a/storage/connect/CMakeLists.txt +++ b/storage/connect/CMakeLists.txt @@ -287,7 +287,6 @@ IF (INSTALL_SYSCONFDIR) ENDIF(INSTALL_SYSCONFDIR) IF(RPM) - SET(CPACK_COMPONENT_CASSANDRASELIBRARIES_GROUP "connect-engine" PARENT_SCOPE) SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} connect-engine PARENT_SCOPE) SET(CPACK_RPM_connect_engine_PACKAGE_REQUIRES "MariaDB-server" PARENT_SCOPE) -- 2.30.9