SOURCES: rpm-doxygen_hack.patch, rpm-epoch0.patch, rpm-noexpand.pa...

[arekm]

Author: arekm                        Date: Sat Jan  5 21:33:23 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up for 5.0.0

---- Files affected:
SOURCES:
   rpm-doxygen_hack.patch (1.9 -> 1.10) , rpm-epoch0.patch (1.3 -> 1.4) , rpm-noexpand.patch (1.6 -> 1.7) , rpm-pld-autodep.patch (1.23 -> 1.24) , rpm-repackage-wo-lzma.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/rpm-doxygen_hack.patch
diff -u SOURCES/rpm-doxygen_hack.patch:1.9 SOURCES/rpm-doxygen_hack.patch:1.10
--- SOURCES/rpm-doxygen_hack.patch:1.9	Tue May 22 19:48:50 2007
+++ SOURCES/rpm-doxygen_hack.patch	Sat Jan  5 22:33:18 2008
@@ -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 \

================================================================
Index: SOURCES/rpm-epoch0.patch
diff -u SOURCES/rpm-epoch0.patch:1.3 SOURCES/rpm-epoch0.patch:1.4
--- SOURCES/rpm-epoch0.patch:1.3	Mon Mar 22 00:33:20 2004
+++ SOURCES/rpm-epoch0.patch	Sat Jan  5 22:33:18 2008
@@ -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;
  

================================================================
Index: SOURCES/rpm-noexpand.patch
diff -u SOURCES/rpm-noexpand.patch:1.6 SOURCES/rpm-noexpand.patch:1.7
--- SOURCES/rpm-noexpand.patch:1.6	Sat Oct 20 23:48:51 2007
+++ SOURCES/rpm-noexpand.patch	Sat Jan  5 22:33:18 2008
@@ -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);
  

================================================================
Index: SOURCES/rpm-pld-autodep.patch
diff -u SOURCES/rpm-pld-autodep.patch:1.23 SOURCES/rpm-pld-autodep.patch:1.24
--- SOURCES/rpm-pld-autodep.patch:1.23	Sat Oct 20 23:50:59 2007
+++ SOURCES/rpm-pld-autodep.patch	Sat Jan  5 22:33:18 2008
@@ -343,7 +343,7 @@
 +    return 0;
 +}
 +
- int rpmfcApply(rpmfc fc)
+ rpmRC rpmfcApply(rpmfc fc)
  {
      rpmfcApplyTbl fcat;
 @@ -888,6 +1082,26 @@

================================================================
Index: SOURCES/rpm-repackage-wo-lzma.patch
diff -u SOURCES/rpm-repackage-wo-lzma.patch:1.1 SOURCES/rpm-repackage-wo-lzma.patch:1.2
--- SOURCES/rpm-repackage-wo-lzma.patch:1.1	Mon Sep 25 20:05:51 2006
+++ SOURCES/rpm-repackage-wo-lzma.patch	Sat Jan  5 22:33:18 2008
@@ -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 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-doxygen_hack.patch?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-epoch0.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-noexpand.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-pld-autodep.patch?r1=1.23&r2=1.24&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-repackage-wo-lzma.patch?r1=1.1&r2=1.2&f=u