diff options
| author | Alexey Bychko <alexey.bychko@mariadb.com> | 2022-01-12 20:03:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-01-14 22:16:39 +0100 |
| commit | 746050d02d6b927c59767c8ff121e0d674520f90 (patch) | |
| tree | be3cc1ced4536bbb2783808a57026d8e6e3b0aad | |
| parent | b5a14f061b9ee3df46bd6b52200e0fcc466d7695 (diff) | |
| download | mariadb-git-746050d02d6b927c59767c8ff121e0d674520f90.tar.gz | |
MDEV-27109 mysql_config mariadb_config lists non existant -lmariadb
added dependency devel->shared and conflict with previous versions
update C/C 3.1 with the corresponding C/C part of the fix
| -rw-r--r-- | cmake/cpack_rpm.cmake | 4 | ||||
| m--------- | libmariadb | 0 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 3eb11591875..2dabfd480eb 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -27,7 +27,7 @@ SET(CPACK_COMPONENT_BACKUP_GROUP "backup") SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts SupportFiles Development ManPagesDevelopment - ManPagesTest Readme ManPagesClient Test + ManPagesTest Readme ManPagesClient Test Common Client SharedLibraries ClientPlugins backup ) @@ -186,6 +186,8 @@ SETA(CPACK_RPM_devel_PACKAGE_OBSOLETES "MySQL-devel") SETA(CPACK_RPM_devel_PACKAGE_PROVIDES "MySQL-devel") +SETA(CPACK_RPM_devel_PACKAGE_REQUIRES + "MariaDB-shared >= 10.2.42") SETA(CPACK_RPM_server_PACKAGE_OBSOLETES "MariaDB" diff --git a/libmariadb b/libmariadb -Subproject 735a7299dbae19cc2b82b9697becaf90e9b4304 +Subproject dde7deee51fb4bab475a3e78b66d5ef0872a8d9 |