MDEV-26165 Failed to upgrade from 10.4 to 10.6

It shouldn't be possible to install an old MariaDB-common
with a new MariaDB-server or vice versa.

cmake/cpack_rpm.cmake

@@ -157,6 +157,9 @@ SETA(CPACK_RPM_client_PACKAGE_PROVIDES
 SETA(CPACK_RPM_client_PACKAGE_CONFLICTS
   "MariaDB-server < 10.6.0")
 
+SETA(CPACK_RPM_common_PACKAGE_CONFLICTS
+  "MariaDB-server < 10.6.1")
+
 SETA(CPACK_RPM_devel_PACKAGE_OBSOLETES
   "MySQL-devel")
 SETA(CPACK_RPM_devel_PACKAGE_PROVIDES
@@ -181,7 +184,7 @@ SETA(CPACK_RPM_test_PACKAGE_PROVIDES
   "MySQL-test")
 
 SETA(CPACK_RPM_server_PACKAGE_REQUIRES
-  "${CPACK_RPM_PACKAGE_REQUIRES}"
+  "MariaDB-common >= 10.6.1"
   "MariaDB-client")
 
 IF(WITH_WSREP)