---- rpm-4.3/build/parseChangelog.c.wiget Tue Jun 25 16:52:52 2002
-+++ rpm-4.3/build/parseChangelog.c Fri May 16 00:06:47 2003
-@@ -221,7 +221,7 @@
-
- while (! (nextPart = isPart(spec->line))) {
+--- rpm-4.4.3/build/parseChangelog.c.orig 2005-11-12 01:20:12.000000000 +0100
++++ rpm-4.4.3/build/parseChangelog.c 2005-11-18 19:46:50.357322048 +0100
+@@ -255,7 +255,7 @@
+ line = xstrtolocale(line);
appendStringBuf(sb, spec->line);
+ line = _free(line);
- if ((rc = readLine(spec, STRIP_COMMENTS)) > 0) {
+ if ((rc = readLine(spec, STRIP_COMMENTS | STRIP_NOEXPAND)) > 0) {
nextPart = PART_NONE;
}
--- rpm-4.3/build/parseSpec.c.wiget Thu May 15 18:15:51 2003
+++ rpm-4.3/build/parseSpec.c Fri May 16 00:08:57 2003
-@@ -156,12 +156,16 @@
- ofi->readPtr = from;
+@@ -230,12 +230,16 @@
+ /*@=mods@*/
/* Don't expand macros (eg. %define) in false branch of %if clause */
+ /* Also don't expand macros in %changelog where we set STRIP_NOEXPAND flag */
+ /* (first line is ommited, so if there is e.g. %date macro, it will be expanded */
+ if (!(strip & STRIP_NOEXPAND)) {
if (spec->readStack->reading &&
- expandMacros(spec, spec->macros, spec->lbuf, sizeof(spec->lbuf))) {
- rpmError(RPMERR_BADSPEC, _("line %d: %s\n"),
+ expandMacros(spec, spec->macros, spec->lbuf, spec->lbuf_len)) {
+ rpmlog(RPMLOG_ERR, _("line %d: %s\n"),
spec->lineNum, spec->lbuf);
- return RPMERR_BADSPEC;
+ return RPMRC_FAIL;
}
-+ }
++ }
spec->nextline = spec->lbuf;
}
-
+ return 0;
@@ -273,6 +277,7 @@
SKIPSPACE(s);