- up for 5.0.0

Changed files:
    rpm-doxygen_hack.patch -> 1.10
    rpm-epoch0.patch -> 1.4
    rpm-noexpand.patch -> 1.7
    rpm-pld-autodep.patch -> 1.24
    rpm-repackage-wo-lzma.patch -> 1.2

diff --git a/rpm-doxygen_hack.patch b/rpm-doxygen_hack.patch
index 4654eba80c679c40219bb2cc92b01555eb99da1e..2b1244cb4e66253d02c65feddca9f23193a0a9c6 100644 (file)
--- a/rpm-doxygen_hack.patch
+++ b/rpm-doxygen_hack.patch
@@ -1,25 +1,9 @@
 --- rpm-4.4.9/Doxyfile.in.orig 2007-05-13 05:20:43.000000000 +0200
 +++ rpm-4.4.9/Doxyfile.in      2007-05-22 17:41:12.107028314 +0200
-@@ -504,23 +504,6 @@
+@@ -504,7 +504,6 @@
                           @top_srcdir@/doc/manual/spec \
                           @top_srcdir@/doc/manual/triggers \
                           @top_srcdir@/doc/manual/tsort \
--                         @top_srcdir@/file/src/apprentice.c \
--                         @top_srcdir@/file/src/apptype.c \
--                         @top_srcdir@/file/src/ascmagic.c \
--                         @top_srcdir@/file/src/compress.c \
--                         @top_srcdir@/file/src/file.c \
--                         @top_srcdir@/file/src/file.h \
--                         @top_srcdir@/file/src/fsmagic.c \
--                         @top_srcdir@/file/src/funcs.c \
--                         @top_srcdir@/file/src/is_tar.c \
--                         @top_srcdir@/file/src/magic.c \
--                         @top_srcdir@/file/src/magic.h \
--                         @top_srcdir@/file/src/names.h \
--                         @top_srcdir@/file/src/print.c \
--                         @top_srcdir@/file/src/readelf.c \
--                         @top_srcdir@/file/src/readelf.h \
--                         @top_srcdir@/file/src/softmagic.c \
 -                         @top_srcdir@/file/src/tar.h \
                           @top_srcdir@/lib/cpio.c \
                           @top_srcdir@/lib/cpio.h \

diff --git a/rpm-epoch0.patch b/rpm-epoch0.patch
index cdf2b5f3151a75d5d4f6b5d3a0dd2862c66cdd3c..1ce9a7568134cfe022750581a92d103023fa3045 100644 (file)
--- a/rpm-epoch0.patch
+++ b/rpm-epoch0.patch
@@ -2,7 +2,7 @@
 +++ rpm-4.3/build/parsePreamble.c      2004-02-29 15:40:58.466804704 +0100
 @@ -942,6 +943,12 @@
        headerCopyTags(spec->packages->header, pkg->header,
-                       (int_32 *)copyTagsDuringParse);
+                       (uint32_t *)copyTagsDuringParse);
  
 +    if (headerGetEntry(pkg->header, RPMTAG_EPOCH, NULL, NULL, NULL) == 0) {
 +      int num = 0;
@@ -10,6 +10,6 @@
 +      addMacro(spec->macros, "epoch", NULL, "0", RMIL_SPEC);
 +    }
 +    
-     if (checkForRequired(pkg->header, NVR))
-       return RPMERR_BADSPEC;
+     if (checkForRequired(pkg->header, NVR) != RPMRC_OK)
+       return RPMRC_FAIL;
  

diff --git a/rpm-noexpand.patch b/rpm-noexpand.patch
index 589c1bd9d3f706d1aa8237db6ca9c763c4c67bdc..87c7e7a019f16b1f3e26a3d9962768056fe022a4 100644 (file)
--- a/rpm-noexpand.patch
+++ b/rpm-noexpand.patch
@@ -11,7 +11,7 @@
        }
 --- 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 @@
+@@ -230,12 +230,16 @@
  /*@=mods@*/
  
        /* Don't expand macros (eg. %define) in false branch of %if clause */
@@ -19,15 +19,15 @@
 +      /* (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))) {
+           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;
 @@ -273,6 +277,7 @@
      SKIPSPACE(s);
  

diff --git a/rpm-pld-autodep.patch b/rpm-pld-autodep.patch
index ad4b88456983024b34cf32a4e70f0b1caf10480a..626ef34144f3eecd3c80d812a365956229d9ba53 100644 (file)
--- a/rpm-pld-autodep.patch
+++ b/rpm-pld-autodep.patch
@@ -343,7 +343,7 @@ diff -ur rpm.org/lib/rpmfc.c rpm/lib/rpmfc.c
 +    return 0;
 +}
 +
- int rpmfcApply(rpmfc fc)
+ rpmRC rpmfcApply(rpmfc fc)
  {
      rpmfcApplyTbl fcat;
 @@ -888,6 +1082,26 @@

diff --git a/rpm-repackage-wo-lzma.patch b/rpm-repackage-wo-lzma.patch
index 5daf06b4b5974ce9570e5c4942021c618b95d4b2..0a770b4da2e74be21596f2a85637eb14bc95c4a5 100644 (file)
--- a/rpm-repackage-wo-lzma.patch
+++ b/rpm-repackage-wo-lzma.patch
@@ -3,9 +3,9 @@
 @@ -6,6 +6,7 @@
  #include "system.h"
  
- #include <rpmio_internal.h>
+ #include <rpmio_internal.h>   /* XXX FDSTAT_READ */
 +#include <header_internal.h>
- #include <rpmlib.h>
+ #include <rpmcb.h>            /* XXX fnpyKey */
  #include <rpmmacro.h>
  #include <rpmurl.h>
 @@ -1403,6 +1404,19 @@