[Mageia-dev] [RFC] remove support for /etc/rpm/macros.d/*.macros

[Olivier Thauvin]

* nicolas vigier (boklm at mars-attacks.org) wrote:
> On Mon, 30 Jul 2012, Thierry Vignaud wrote:
> 
> > Hi
> > 
> > For years, we patch our rpm in order to support for /etc/rpm/macros.d
> > (very old compat with rpm-4.4).
> > Upstream refused to merge it as "/etc/rpm/ is a "macros.d" style
> > directory already, except in name".
> 
> In a previous mail Colin was suggesting moving all macro files to
> /usr/lib/rpm/ instead of /etc/rpm :
> http://www.mageia.org/pipermail/mageia-dev/2012-July/017654.html
> 
> I think shipping macro files somewhere in /usr/lib/rpm with users using
> files in /etc/rpm to overwrite macros would be nice. Unfortunately this
> probably requires an other patch to rpm.
> 
> Maybe a patch to read /usr/lib/rpm/mageia/macros.* could be accepted
> upstream ?

Ask for /usr/lib/rpm/mageia/*.macros instead !

> 
> Something like this :
> 
> diff --git a/lib/rpmrc.c b/lib/rpmrc.c
> index 96f05ce..bef589f 100644
> --- a/lib/rpmrc.c
> +++ b/lib/rpmrc.c
> @@ -439,6 +439,7 @@ static void setDefaults(void)
>         macrofiles = rstrscat(NULL, confdir, "/macros", ":",
>                                 confdir, "/platform/%{_target}/macros", ":",
>                                 confdir, "/fileattrs/*.attr", ":",
> +                               confdir, "/" RPMCANONVENDOR "/macros.*", ":",
>                                 confdir, "/" RPMCANONVENDOR "/macros", ":",
>                                 SYSCONFDIR "/rpm/macros.*", ":",
>                                 SYSCONFDIR "/rpm/macros", ":",
> 
> 

-- 

Olivier Thauvin
CNRS  -  LATMOS
♖ ♘ ♗ ♕ ♔ ♗ ♘ ♖
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: </pipermail/mageia-dev/attachments/20120730/12d9c24b/attachment.asc>