- pass CLASSPATH to %ant so wouldn't need to export it

[packages/rpm.git] / rpm-noexpand.patch

diff --git a/rpm-noexpand.patch b/rpm-noexpand.patch
index 9da650077a976d7b4259b6f223d1c16113cc7197..7e796f6934474201c8d79ff434d59e584f2c83e0 100644 (file)
--- a/rpm-noexpand.patch
+++ b/rpm-noexpand.patch
@@ -1,42 +1,60 @@
---- rpm-4.0.4/build/parseChangelog.c.wiget     Sat Jan  5 19:40:22 2002
-+++ rpm-4.0.4/build/parseChangelog.c   Tue Feb 12 22:52:02 2002
-@@ -217,7 +217,7 @@
-     
-     while (! (nextPart = isPart(spec->line))) {
+--- rpm-5.0.1.noexpand/build/parseChangelog.c  2008-01-31 01:18:18.506330692 +0200
++++ rpm-5.0.1/build/parseChangelog.c   2008-01-31 01:20:45.467027848 +0200
+@@ -318,7 +318,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;
            break;
        }
---- rpm-4.0.4/build/parseSpec.c.wiget  Sun Jan 20 22:03:52 2002
-+++ rpm-4.0.4/build/parseSpec.c        Tue Feb 12 23:02:16 2002
-@@ -143,12 +143,16 @@
-       ofi->readPtr = from;
+--- rpm-5.0.1.noexpand/build/parseSpec.c       2008-01-31 01:18:18.509664191 +0200
++++ rpm-5.0.1/build/parseSpec.c        2008-01-31 01:20:45.073674806 +0200
+@@ -168,7 +168,7 @@
+ 
+ /**
+  */
+-static int copyNextLineFromOFI(Spec spec, OFI_t * ofi)
++static int copyNextLineFromOFI(Spec spec, OFI_t * ofi, int strip)
+       /*@globals rpmGlobalMacroContext, h_errno,
+               fileSystem @*/
+       /*@modifies spec->nextline, spec->nextpeekc, spec->lbuf, spec->line,
+@@ -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"),
-                       spec->lineNum, spec->lbuf);
-               return RPMERR_BADSPEC;
-       }
-+      }       
+       if (spec->readStack->reading &&
+           expandMacros(spec, spec->macros, spec->lbuf, spec->lbuf_len)) {
+               rpmlog(RPMLOG_ERR, _("line %d: %s\n"),
+                       spec->lineNum, spec->lbuf);
+               return RPMRC_FAIL;
+       }
++      }
        spec->nextline = spec->lbuf;
      }
+     return 0;
+@@ -347,7 +351,7 @@
+ 
+       /* Copy next file line into the spec line buffer */
  
-@@ -258,6 +262,7 @@
+-      if ((rc = copyNextLineFromOFI(spec, ofi)) != 0) {
++      if ((rc = copyNextLineFromOFI(spec, ofi, strip)) != 0) {
+       if (rc == RPMRC_FAIL)
+           goto retry;
+       return rc;
+@@ -360,6 +364,7 @@
      SKIPSPACE(s);
  
      match = -1;
 +    if (! (strip & STRIP_NOEXPAND)) {
-     if (! strncmp("%ifarch", s, sizeof("%ifarch")-1)) {
-       const char *arch = rpmExpand("%{_target_cpu}", NULL);
-       s += 7;
-@@ -337,6 +342,7 @@
+     if (!spec->readStack->reading && !strncmp("%if", s, sizeof("%if")-1)) {
+       match = 0;
+     } else if (! strncmp("%ifarch", s, sizeof("%ifarch")-1)) {
+@@ -441,6 +446,7 @@
        ofi = spec->fileStack;
        goto retry;
      }
@@ -44,13 +62,13 @@
  
      if (match != -1) {
        rl = xmalloc(sizeof(*rl));
---- rpm-4.0.4/build/rpmbuild.h.wiget   Sun Jan 20 22:17:36 2002
-+++ rpm-4.0.4/build/rpmbuild.h Tue Feb 12 22:52:02 2002
-@@ -73,6 +73,7 @@
+--- rpm-5.0.1.noexpand/build/rpmbuild.h        2008-01-31 01:18:18.509664191 +0200
++++ rpm-5.0.1/build/rpmbuild.h 2008-01-31 01:20:45.073674806 +0200
+@@ -83,6 +83,7 @@
  #define STRIP_NOTHING             0
  #define STRIP_TRAILINGSPACE (1 << 0)
  #define STRIP_COMMENTS      (1 << 1)
 +#define STRIP_NOEXPAND      (1 << 2)
  
- #ifdef __cplusplus
- extern "C" {
+ /*@unchecked@*/
+ extern int _rpmbuildFlags;