removed noexpand patch - applied upstream

diff --git a/rpm-noexpand.patch b/rpm-noexpand.patch
deleted file mode 100644 (file)
index 7e796f6..0000000
--- a/rpm-noexpand.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- 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-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, 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 */
- 
--      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 (!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;
-     }
-+    }
- 
-     if (match != -1) {
-       rl = xmalloc(sizeof(*rl));
---- 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)
- 
- /*@unchecked@*/
- extern int _rpmbuildFlags;

diff --git a/rpm.spec b/rpm.spec
index 98639ef8ec07d248c8f8f76f1a298f30f16b310d..343d3530840418498d9a203f6e63a1949e8bc8d5 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -115,7 +115,6 @@ Patch2:             %{name}-popt-aliases.patch
 Patch3:                %{name}-rpmpopt.patch
 Patch4:                %{name}-perl-macros.patch
 Patch5:                %{name}-perl-req-perlfile.patch
-Patch6:                %{name}-noexpand.patch
 Patch7:                %{name}-scripts-closefds.patch
 Patch8:                %{name}-php-macros.patch
 Patch9:                %{name}-gettext-in-header.patch
@@ -681,7 +680,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-#%patch6 -p1 // in upstream
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1