maria-developers team mailing list archive

[Sergei Golubchik <serg@xxxxxxxxxxx>]

Hi, Sergey!

I cannot verify whether rhel7 alternative names should match Fedora
names or they should be something different.

Assuming they should match, your patch is ok.

On Oct 09, Sergey Vojtovich wrote:
> ------------------------------------------------------------
> revno: 4323
> revision-id: svoj@xxxxxxxxxxx-20141009112748-eq3xwoyobgnz0cxj
> parent: svoj@xxxxxxxxxxx-20141008141031-xv2x7vrq269202vf
> committer: Sergey Vojtovich <svoj@xxxxxxxxxxx>
> branch nick: 5.5
> timestamp: Thu 2014-10-09 15:27:48 +0400
> message:
>   Set proper alternative names on RHEL7: they should match Fedora names.
> === modified file 'cmake/cpack_rpm.cmake'
> --- a/cmake/cpack_rpm.cmake	2014-10-08 07:35:00 +0000
> +++ b/cmake/cpack_rpm.cmake	2014-10-09 11:27:48 +0000
> @@ -182,7 +182,7 @@ IF(RPM MATCHES "(rhel|centos)5")
>  ELSEIF(RPM MATCHES "(rhel|centos)6")
>    ALTERNATIVE_NAME("client" "mysql")
>    ALTERNATIVE_NAME("shared" "mysql-libs")
> -ELSEIF(RPM MATCHES "fedora")
> +ELSEIF(RPM MATCHES "fedora" OR RPM MATCHES "(rhel|centos)7")
>    SET(epoch 1) # this is fedora
>    ALTERNATIVE_NAME("client" "mariadb")
>    ALTERNATIVE_NAME("client" "mysql")

Regards,
Sergei