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

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
746050d0 · Alexey Bychko · Sergei Golubchik · b5a14f06 · 746050d0 · dde7deee
Commit 746050d0 authored Jan 12, 2022 by Alexey Bychko Committed by Sergei Golubchik Jan 14, 2022
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

cmake/cpack_rpm.cmake cmake/cpack_rpm.cmake +3 -1

libmariadb libmariadb +1 -1

No files found.
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@ -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"

--- a/libmariadb @ dde7deee
+++ b/libmariadb @ dde7deee
-Subproject commit 735a7299dbae19cc2b82b9697becaf90e9b43047
+Subproject commit dde7deee51fb4bab475a3e78b66d5ef0872a8d98