1 --- rpm-4.4.2/rpmio/macro.c~ 2006-04-27 00:49:59.000000000 +0300
2 +++ rpm-4.4.2/rpmio/macro.c 2006-04-27 00:50:04.000000000 +0300
3 @@ -2000,10 +2000,16 @@
6 /* Read macros from each file. */
7 - for (i = 0; i < ac; i++) {
8 - (void) rpmLoadMacroFile(mc, av[i]);
9 - av[i] = _free(av[i]);
10 + for (i = 0; i < ac; i++) {
11 + size_t slen = strlen(av[i]);
12 + if ((av[i])[slen-1] != '~' &&
13 + (slen < 8 || strcmp((av[i] + slen - 7), ".rpmnew")) &&
14 + (slen < 9 || (strcmp((av[i] + slen - 8), ".rpmorig") &&
15 + strcmp((av[i] + slen - 8), ".rpmsave")))) {
16 + (void) rpmLoadMacroFile(mc, av[i]);
18 + av[i] = _free(av[i]);
22 mfiles = _free(mfiles);