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

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"

libmariadb @ dde7deee

-Subproject commit 735a7299dbae19cc2b82b9697becaf90e9b43047
+Subproject commit dde7deee51fb4bab475a3e78b66d5ef0872a8d98