maria-developers team mailing list archive

[Sergei Golubchik <serg@xxxxxxxxxxx>]

Hi, Daniel,

On Feb 09, Daniel Black wrote:
> revision-id: ceb75e9bd9e (mariadb-10.11.1-152-gceb75e9bd9e)
> parent(s): 526fce28b90
> author: Daniel Black
> committer: Daniel Black
> timestamp: 2023-02-09 12:20:57 +1100
> message:
> 
> MDEV-30203: Move mysql symlinks to different package (fixes)
> 
> Fixes MDEV-30571 MariaDB-client does not pull MariaDB-compat anymore, conflicts with RHEL packages
> 
> Fixes MDEV-30574 MariaDB-server conflicts with MariaDB-common from previous versions
> 
> MariaDB-Server now depends on MariaDB-common 11.0+.
> 
> MariaDB-{Client,Server} append to the Requirements rather than overriding them.
> 
> MariaDB-Server package now depends on the MariaDB-client 11.0+.
> 
> Because of moves between packages MariaDB-Client conflicts with
> MariaDB-server < 11.0.0.
> 
> diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
> index 638f6b2dabb..e88a5493eac 100644
> --- a/cmake/cpack_rpm.cmake
> +++ b/cmake/cpack_rpm.cmake
> @@ -189,7 +189,7 @@ FOREACH(SYM_COMPONENT Server Client)
>    SET(CPACK_RPM_${SYM}_PACKAGE_ARCHITECTURE "noarch")
>    SET(CPACK_RPM_${SYM}_USER_FILELIST ${ignored})
>    STRING(TOLOWER ${SYM_COMPONENT} SYM_COMPONENT_LOWER)
> -  SET(CPACK_RPM_${SYM}_PACKAGE_REQUIRES "MariaDB-${SYM_COMPONENT_LOWER} >= 11.0.0")
> +  SETA(CPACK_RPM_${SYM}_PACKAGE_REQUIRES "MariaDB-${SYM_COMPONENT_LOWER} >= 11.0.0")

why?

>    SETA(CPACK_RPM_${SYM_COMPONENT_LOWER}_PACKAGE_RECOMMENDS "MariaDB-${SYM}")
>  ENDFOREACH()
>  
> @@ -205,10 +205,10 @@ SETA(CPACK_RPM_client_PACKAGE_PROVIDES
>    "mysql-client"
>    "mytop")
>  SETA(CPACK_RPM_client_PACKAGE_CONFLICTS
> -  "MariaDB-server < 10.6.0")
> +  "MariaDB-server < 11.0.0")

because of resolve-stack-dump, ok

>  SETA(CPACK_RPM_common_PACKAGE_CONFLICTS
> -  "MariaDB-server < 10.6.1")
> +  "MariaDB-server < 11.0.0")

why?

>  SETA(CPACK_RPM_devel_PACKAGE_OBSOLETES
>    "MySQL-devel")

Regards,
Sergei
VP of MariaDB Server Engineering
and security@xxxxxxxxxxx