diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-04 13:41:45 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-12 17:51:49 +0200 |
| commit | 017195c3631b681ec7fdae9b6b2aaf23fc758dfd (patch) | |
| tree | b27e2b63f1d7eab9395843623df104a4f8163430 /cmake | |
| parent | 85828b8f22e7f4dfa6a5d4b0a1ab9e133e7feea7 (diff) | |
| download | mariadb-git-017195c3631b681ec7fdae9b6b2aaf23fc758dfd.tar.gz | |
fix RPM builds
to specify correct VENDOR and LICENSE for C/C
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CPackRPM.cmake | 16 | ||||
| -rw-r--r-- | cmake/cpack_rpm.cmake | 14 |
2 files changed, 30 insertions, 0 deletions
diff --git a/cmake/CPackRPM.cmake b/cmake/CPackRPM.cmake index 1d22387d098..3b57decc5bb 100644 --- a/cmake/CPackRPM.cmake +++ b/cmake/CPackRPM.cmake @@ -2,12 +2,28 @@ # Wrapper for CPackRPM.cmake # +macro(set_from_component WHAT) + set(orig_CPACK_RPM_PACKAGE_${WHAT} ${CPACK_RPM_PACKAGE_${WHAT}}) + if(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_${WHAT}) + set(CPACK_RPM_PACKAGE_${WHAT} ${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_${WHAT}}) + endif() +endmacro() +macro(restore WHAT) + set(CPACK_RPM_PACKAGE_${WHAT} ${orig_CPACK_RPM_PACKAGE_${WHAT}}) +endmacro() + +set_from_component(LICENSE) +set_from_component(VENDOR) + # load the original CPackRPM.cmake set(orig_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}) unset(CMAKE_MODULE_PATH) include(CPackRPM) set(CMAKE_MODULE_PATH ${orig_CMAKE_MODULE_PATH}) +restore(LICENSE) +restore(VENDOR) + # per-component cleanup foreach(_RPM_SPEC_HEADER URL REQUIRES SUGGESTS PROVIDES OBSOLETES PREFIX CONFLICTS AUTOPROV AUTOREQ AUTOREQPROV) unset(TMP_RPM_${_RPM_SPEC_HEADER}) diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 0e0a121dbb8..9e174180754 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -48,6 +48,20 @@ MariaDB bug reports should be submitted through https://jira.mariadb.org ") +SET(CPACK_RPM_shared_PACKAGE_VENDOR "MariaDB Corporation Ab") +SET(CPACK_RPM_shared_PACKAGE_LICENSE "LGPLv2.1") +SET(CPACK_RPM_shared_PACKAGE_SUMMARY "LGPL MariaDB client library") +SET(CPACK_RPM_shared_PACKAGE_DESCRIPTION " +This is LGPL MariaDB client library that can be used to connect to MySQL +or MariaDB. + +This code is based on the LGPL libmysql client library from MySQL 3.23 +and PHP's mysqlnd extension. + +This product includes PHP software, freely available from +<http://www.php.net/software/> +") + SET(CPACK_RPM_SPEC_MORE_DEFINE " %define mysql_vendor ${CPACK_PACKAGE_VENDOR} %define mysqlversion ${MYSQL_NO_DASH_VERSION} |