diff options
| author | Alexey Bychko <alexey.bychko@mariadb.com> | 2021-11-27 12:30:51 +0700 |
|---|---|---|
| committer | Alexey Bychko <alexey.bychko@mariadb.com> | 2021-11-28 11:42:20 +0700 |
| commit | 69126ffc958543cb9a49984ec716103b943a8f53 (patch) | |
| tree | a0e3a3ffb2044c536acb011ba9e7d379029e0988 | |
| parent | f809a4fbd069dc2986677eabde50b1a253f6695f (diff) | |
| download | mariadb-git-bb-10.2-MDEV-27109.tar.gz | |
MDEV-27109 mysql_config mariadb_config lists non existant -lmariadbbb-10.2-MDEV-27109
server part of MDEV-27109.
added dependency devel->shared and conflict with previous versions
| -rw-r--r-- | cmake/cpack_rpm.cmake | 5 | ||||
| m--------- | libmariadb | 0 |
2 files changed, 4 insertions, 1 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index eacb6310ece..917f6249946 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -185,7 +185,10 @@ 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_devel_PACKAGE_CONFLICTS + "MariaDB-shared <= 10.2.41") SETA(CPACK_RPM_server_PACKAGE_OBSOLETES "MariaDB" "MySQL" diff --git a/libmariadb b/libmariadb -Subproject 735a7299dbae19cc2b82b9697becaf90e9b4304 +Subproject dbd8ffa35975dc2a7a7a7566745bdeaa8e9da6a |