[Mageia-dev] [1601] Do not append .%distro_section if section is core
Thomas Backlund
tmb at mageia.org
Mon May 30 14:08:28 CEST 2011
root-odJJhXpcy38dnm+yROfE0A at public.gmane.org skrev 30.5.2011 14:44:
> Revision
> 1601
> Author
> pterjan
> Date
> 2011-05-30 13:44:17 +0200 (Mon, 30 May 2011)
>
>
> Log Message
>
> Do not append .%distro_section if section is core
>
[...]
>
> Modified: rpm/rpm-setup/trunk/build.macros.in
> ===================================================================
> --- rpm/rpm-setup/trunk/build.macros.in 2011-05-30 10:02:43 UTC (rev 1600)
> +++ rpm/rpm-setup/trunk/build.macros.in 2011-05-30 11:44:17 UTC (rev 1601)
> @@ -152,7 +152,7 @@
>
> %distsuffix @DISTSUFFIX@
>
> -%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?distsuffix:%distsuffix}%{?!distsuffix:.mga}%{?distro_release:%distro_release}%{?distro_section:.%distro_section}
> +%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?distsuffix:%distsuffix}%{?!distsuffix:.mga}%{?distro_release:%distro_release}%(["%{distro_section}" !="core" ]&& echo .%distro_section)
>
This is wrong...
It will trigger on nonfree
Isnt it better to only check for tainted ?
--
Thomas
More information about the Mageia-dev
mailing list