summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmake/cpack_rpm.cmake5
m---------libmariadb0
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