RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   13-Oct-2007 22:00:55
  Branch: HEAD                             Handle: 2007101321005401

  Modified files:
    rpm                     CHANGES
    rpm/lib                 rpmfi.c rpmfi.h

  Log:
    - jbj: nuke fi->keep_header.

  Summary:
    Revision    Changes     Path
    1.1687      +1  -0      rpm/CHANGES
    2.84        +0  -2      rpm/lib/rpmfi.c
    2.42        +0  -1      rpm/lib/rpmfi.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1686 -r1.1687 CHANGES
  --- rpm/CHANGES	13 Oct 2007 19:56:45 -0000	1.1686
  +++ rpm/CHANGES	13 Oct 2007 20:00:54 -0000	1.1687
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - jbj: nuke fi->keep_header.
       - jbj: rpmfi.c: use headerGetExtension everywhere. Ptooey! pita ...
       - jbj: scareMem = 0 everywhere FINALLY! Yippie!
       - jbj: rpmds.c: use headerGetExtension everywhere.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmfi.c
  ============================================================================
  $ cvs diff -u -r2.83 -r2.84 rpmfi.c
  --- rpm/lib/rpmfi.c	13 Oct 2007 19:56:45 -0000	2.83
  +++ rpm/lib/rpmfi.c	13 Oct 2007 20:00:55 -0000	2.84
  @@ -1360,8 +1360,6 @@
   if (fi->actions == NULL)
   	fi->actions = xcalloc(fi->fc, sizeof(*fi->actions));
   
  -    fi->keep_header = 0;
  -
       /* XXX TR_REMOVED needs CPIO_MAP_{ABSOLUTE,ADDDOT} CPIO_ALL_HARDLINKS */
       fi->mapflags =
   		CPIO_MAP_PATH | CPIO_MAP_MODE | CPIO_MAP_UID | CPIO_MAP_GID;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmfi.h
  ============================================================================
  $ cvs diff -u -r2.41 -r2.42 rpmfi.h
  --- rpm/lib/rpmfi.h	30 Sep 2007 20:38:25 -0000	2.41
  +++ rpm/lib/rpmfi.h	13 Oct 2007 20:00:55 -0000	2.42
  @@ -162,7 +162,6 @@
       int * fmapflags;
   /*@owned@*/
       FSM_t fsm;			/*!< File state machine data. */
  -    int keep_header;		/*!< Keep header? */
       uint_32 color;		/*!< Color bit(s) from file color union. */
   
       int isSource;		/*!< Is this a SRPM? */
  @@ .