1 --- rpm-4.4.3/build/parseChangelog.c.orig 2005-11-12 01:20:12.000000000 +0100
2 +++ rpm-4.4.3/build/parseChangelog.c 2005-11-18 19:46:50.357322048 +0100
4 line = xstrtolocale(line);
5 appendStringBuf(sb, spec->line);
7 - if ((rc = readLine(spec, STRIP_COMMENTS)) > 0) {
8 + if ((rc = readLine(spec, STRIP_COMMENTS | STRIP_NOEXPAND)) > 0) {
12 --- rpm-4.3/build/parseSpec.c.wiget Thu May 15 18:15:51 2003
13 +++ rpm-4.3/build/parseSpec.c Fri May 16 00:08:57 2003
17 /* Don't expand macros (eg. %define) in false branch of %if clause */
18 + /* Also don't expand macros in %changelog where we set STRIP_NOEXPAND flag */
19 + /* (first line is ommited, so if there is e.g. %date macro, it will be expanded */
20 + if (!(strip & STRIP_NOEXPAND)) {
21 if (spec->readStack->reading &&
22 expandMacros(spec, spec->macros, spec->lbuf, sizeof(spec->lbuf))) {
23 rpmError(RPMERR_BADSPEC, _("line %d: %s\n"),
24 spec->lineNum, spec->lbuf);
25 return RPMERR_BADSPEC;
28 spec->nextline = spec->lbuf;
35 + if (! (strip & STRIP_NOEXPAND)) {
36 if (!spec->readStack->reading && !strncmp("%if", s, sizeof("%if")-1)) {
38 } else if (! strncmp("%ifarch", s, sizeof("%ifarch")-1)) {
40 ofi = spec->fileStack;
46 rl = xmalloc(sizeof(*rl));
47 --- rpm-4.3/build/rpmbuild.h.wiget Sat May 10 17:19:33 2003
48 +++ rpm-4.3/build/rpmbuild.h Fri May 16 00:06:47 2003
50 #define STRIP_NOTHING 0
51 #define STRIP_TRAILINGSPACE (1 << 0)
52 #define STRIP_COMMENTS (1 << 1)
53 +#define STRIP_NOEXPAND (1 << 2)