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:   25-Nov-2007 00:55:03
  Branch: HEAD                             Handle: 2007112423550003

  Modified files:
    rpm                     CHANGES build.c
    rpm/build               files.c parseDescription.c parsePreamble.c
                            parsePrep.c parseScript.c parseSpec.c rpmbuild.h
                            spec.c
    rpm/lib                 depends.c formats.c fsm.c psm.c query.c
                            rpmchecksig.c rpmds.c rpmfc.c rpmfi.c rpmgi.c
                            rpminstall.c rpmrollback.c rpmte.c rpmts.c
                            transaction.c verify.c
    rpm/python              rpmts-py.c

  Log:
    - include <header.h> only where needed, doco remaining destruction.

  Summary:
    Revision    Changes     Path
    1.1887      +1  -0      rpm/CHANGES
    2.113       +1  -0      rpm/build.c
    1.294       +1  -0      rpm/build/files.c
    2.31        +1  -0      rpm/build/parseDescription.c
    2.147       +2  -0      rpm/build/parsePreamble.c
    2.93        +1  -0      rpm/build/parsePrep.c
    2.52        +1  -0      rpm/build/parseScript.c
    2.117       +1  -0      rpm/build/parseSpec.c
    2.80        +0  -1      rpm/build/rpmbuild.h
    2.163       +1  -0      rpm/build/spec.c
    1.366       +1  -1      rpm/lib/depends.c
    2.123       +1  -1      rpm/lib/formats.c
    2.138       +1  -1      rpm/lib/fsm.c
    2.268       +1  -1      rpm/lib/psm.c
    2.196       +1  -1      rpm/lib/query.c
    1.200       +1  -1      rpm/lib/rpmchecksig.c
    2.85        +1  -1      rpm/lib/rpmds.c
    1.43        +1  -1      rpm/lib/rpmfc.c
    2.105       +1  -1      rpm/lib/rpmfi.c
    2.44        +1  -1      rpm/lib/rpmgi.c
    1.186       +1  -1      rpm/lib/rpminstall.c
    1.28        +1  -1      rpm/lib/rpmrollback.c
    2.71        +1  -1      rpm/lib/rpmte.c
    2.126       +1  -1      rpm/lib/rpmts.c
    1.357       +1  -1      rpm/lib/transaction.c
    2.179       +1  -1      rpm/lib/verify.c
    1.80        +1  -0      rpm/python/rpmts-py.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1886 -r1.1887 CHANGES
  --- rpm/CHANGES	24 Nov 2007 23:15:31 -0000	1.1886
  +++ rpm/CHANGES	24 Nov 2007 23:55:00 -0000	1.1887
  @@ -1,4 +1,5 @@
   5.0a2 -> 5.0a3:
  +    - jbj: include <header.h> only where needed, doco remaining destruction.
       - jbj: finalize headerMod, add to the ABI, remove HME_t goop.
       - jbj: finalize headerDel, add to the ABI, remove HRE_t goop.
       - jbj: finalize headerPut, add to the ABI, remove HAE_t goop.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build.c
  ============================================================================
  $ cvs diff -u -r2.112 -r2.113 build.c
  --- rpm/build.c	18 Nov 2007 19:51:26 -0000	2.112
  +++ rpm/build.c	24 Nov 2007 23:55:00 -0000	2.113
  @@ -5,6 +5,7 @@
   #include "system.h"
   
   #include <rpmio.h>
  +#include <header.h>		/* XXX headerIsEntry */
   #include <rpmcli.h>
   #include <rpmbuild.h>
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/files.c
  ============================================================================
  $ cvs diff -u -r1.293 -r1.294 files.c
  --- rpm/build/files.c	24 Nov 2007 23:15:31 -0000	1.293
  +++ rpm/build/files.c	24 Nov 2007 23:55:00 -0000	1.294
  @@ -17,6 +17,7 @@
   #include <rpmio_internal.h>
   #include <fts.h>
   
  +#include <header.h>		/* XXX headerIsEntry, headerFreeData, headerInitIterator, headerNextIterator, headerFreeIterator, headerMacrosLoad, headerMacrosUnload */
   #include <rpmbuild.h>
   
   #include "cpio.h"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/parseDescription.c
  ============================================================================
  $ cvs diff -u -r2.30 -r2.31 parseDescription.c
  --- rpm/build/parseDescription.c	11 Oct 2007 13:04:26 -0000	2.30
  +++ rpm/build/parseDescription.c	24 Nov 2007 23:55:00 -0000	2.31
  @@ -6,6 +6,7 @@
   #include "system.h"
   
   #include <rpmio.h>
  +#include <header.h>		/* XXX headerAddI18NString */
   #include "rpmbuild.h"
   #include "debug.h"
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/parsePreamble.c
  ============================================================================
  $ cvs diff -u -r2.146 -r2.147 parsePreamble.c
  --- rpm/build/parsePreamble.c	24 Nov 2007 23:15:31 -0000	2.146
  +++ rpm/build/parsePreamble.c	24 Nov 2007 23:55:00 -0000	2.147
  @@ -6,6 +6,8 @@
   #include "system.h"
   
   #include <rpmio_internal.h>
  +
  +#include <header.h>		/* XXX headerIsEntry, headerInitIterator, headerNextIterator, headerFreeIterator, headerAddI18NString, headerCopyTags */
   #define	_RPMEVR_INTERNAL
   #include <rpmbuild.h>
   #include "debug.h"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/parsePrep.c
  ============================================================================
  $ cvs diff -u -r2.92 -r2.93 parsePrep.c
  --- rpm/build/parsePrep.c	9 Nov 2007 22:20:51 -0000	2.92
  +++ rpm/build/parsePrep.c	24 Nov 2007 23:55:00 -0000	2.93
  @@ -6,6 +6,7 @@
   #include "system.h"
   
   #include <rpmio.h>
  +#include <header.h>		/* XXX headerNEVRA */
   #include <rpmbuild.h>
   #include "debug.h"
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/parseScript.c
  ============================================================================
  $ cvs diff -u -r2.51 -r2.52 parseScript.c
  --- rpm/build/parseScript.c	24 Nov 2007 23:15:31 -0000	2.51
  +++ rpm/build/parseScript.c	24 Nov 2007 23:55:00 -0000	2.52
  @@ -6,6 +6,7 @@
   #include "system.h"
   
   #include <rpmio.h>
  +#include <header.h>		/* XXX headerIsEntry */
   #define	_RPMEVR_INTERNAL
   #include "rpmbuild.h"
   #include "debug.h"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/parseSpec.c
  ============================================================================
  $ cvs diff -u -r2.116 -r2.117 parseSpec.c
  --- rpm/build/parseSpec.c	24 Nov 2007 23:15:31 -0000	2.116
  +++ rpm/build/parseSpec.c	24 Nov 2007 23:55:00 -0000	2.117
  @@ -6,6 +6,7 @@
   #include "system.h"
   
   #include <rpmio_internal.h>
  +#include <header.h>		/* XXX headerIsEntry */
   #include <rpmbuild.h>
   #include "rpmds.h"
   #include "rpmts.h"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/rpmbuild.h
  ============================================================================
  $ cvs diff -u -r2.79 -r2.80 rpmbuild.h
  --- rpm/build/rpmbuild.h	22 Nov 2007 22:28:14 -0000	2.79
  +++ rpm/build/rpmbuild.h	24 Nov 2007 23:55:00 -0000	2.80
  @@ -6,7 +6,6 @@
    *  This is the *only* module users of librpmbuild should need to include.
    */
   
  -#include <header.h>
   #include <rpmcli.h>
   
   /* and it shouldn't need these :-( */
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/spec.c
  ============================================================================
  $ cvs diff -u -r2.162 -r2.163 spec.c
  --- rpm/build/spec.c	24 Nov 2007 22:07:28 -0000	2.162
  +++ rpm/build/spec.c	24 Nov 2007 23:55:00 -0000	2.163
  @@ -6,6 +6,7 @@
   #include "system.h"
   
   #include <rpmio.h>
  +#include <header.h>		/* XXX headerNew, headerFree */
   #include "buildio.h"
   #include "rpmds.h"
   #include "rpmfi.h"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/depends.c
  ============================================================================
  $ cvs diff -u -r1.365 -r1.366 depends.c
  --- rpm/lib/depends.c	24 Nov 2007 22:07:28 -0000	1.365
  +++ rpm/lib/depends.c	24 Nov 2007 23:55:01 -0000	1.366
  @@ -5,7 +5,7 @@
   #include "system.h"
   
   #include "rpmio_internal.h"	/* XXX PGPHASHALGO_MD5 */
  -#include <header.h>
  +#include <header.h>		/* XXX hGetColor, headerIsEntry */
   #include <rpmcli.h>		/* XXX rpmcliPackagesTotal */
   
   #include <rpmmacro.h>		/* XXX rpmExpand("%{_dependency_whiteout}" */
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/formats.c
  ============================================================================
  $ cvs diff -u -r2.122 -r2.123 formats.c
  --- rpm/lib/formats.c	24 Nov 2007 22:07:28 -0000	2.122
  +++ rpm/lib/formats.c	24 Nov 2007 23:55:01 -0000	2.123
  @@ -9,7 +9,7 @@
   #include <rpmmacro.h>		/* XXX for %_i18ndomains */
   
   #define	_RPMTAG_INTERNAL
  -#include <header.h>
  +#include <rpmtag.h>
   #include <rpmlib.h>
   
   #define	_RPMEVR_INTERNAL
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/fsm.c
  ============================================================================
  $ cvs diff -u -r2.137 -r2.138 fsm.c
  --- rpm/lib/fsm.c	22 Nov 2007 22:28:14 -0000	2.137
  +++ rpm/lib/fsm.c	24 Nov 2007 23:55:01 -0000	2.138
  @@ -7,7 +7,7 @@
   
   #include <rpmio_internal.h>	/* XXX urlPath, fdGetCpioPos */
   #include <rpmcb.h>		/* XXX fnpyKey */
  -#include <header.h>
  +#include <rpmtag.h>
   #include <rpmlib.h>
   
   #include "cpio.h"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  ============================================================================
  $ cvs diff -u -r2.267 -r2.268 psm.c
  --- rpm/lib/psm.c	24 Nov 2007 23:15:32 -0000	2.267
  +++ rpm/lib/psm.c	24 Nov 2007 23:55:01 -0000	2.268
  @@ -10,7 +10,7 @@
   #include <rpmmacro.h>
   #include <rpmurl.h>
   #include <rpmlua.h>
  -#include <header.h>
  +#include <rpmtag.h>
   #include <rpmlib.h>
   
   #include "cpio.h"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/query.c
  ============================================================================
  $ cvs diff -u -r2.195 -r2.196 query.c
  --- rpm/lib/query.c	24 Nov 2007 19:46:05 -0000	2.195
  +++ rpm/lib/query.c	24 Nov 2007 23:55:01 -0000	2.196
  @@ -13,7 +13,7 @@
   
   #include <rpmio.h>
   #define	_RPMTAG_INTERNAL
  -#include <header.h>
  +#include <rpmtag.h>
   #include <rpmcli.h>
   
   #include "rpmdb.h"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmchecksig.c
  ============================================================================
  $ cvs diff -u -r1.199 -r1.200 rpmchecksig.c
  --- rpm/lib/rpmchecksig.c	24 Nov 2007 23:15:32 -0000	1.199
  +++ rpm/lib/rpmchecksig.c	24 Nov 2007 23:55:01 -0000	1.200
  @@ -6,7 +6,7 @@
   #include "system.h"
   
   #include "rpmio_internal.h"
  -#include <header.h>
  +#include <rpmtag.h>
   #include <rpmcli.h>
   #define	_RPMEVR_INTERNAL	/* XXX RPMSENSE_KEYRING */
   #include <rpmevr.h>
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmds.c
  ============================================================================
  $ cvs diff -u -r2.84 -r2.85 rpmds.c
  --- rpm/lib/rpmds.c	24 Nov 2007 22:07:28 -0000	2.84
  +++ rpm/lib/rpmds.c	24 Nov 2007 23:55:01 -0000	2.85
  @@ -78,7 +78,7 @@
   #include <rpmio_internal.h>	/* XXX fdGetFILE */
   #include <rpmcb.h>		/* XXX fnpyKey */
   #include <rpmmacro.h>
  -#include <header.h>
  +#include <header.h>		/* XXX headerFree, headerNEVRA, headerLink */
   #include <rpmlib.h>
   
   #define	_RPMDS_INTERNAL
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmfc.c
  ============================================================================
  $ cvs diff -u -r1.42 -r1.43 rpmfc.c
  --- rpm/lib/rpmfc.c	24 Nov 2007 23:15:32 -0000	1.42
  +++ rpm/lib/rpmfc.c	24 Nov 2007 23:55:01 -0000	1.43
  @@ -4,7 +4,7 @@
   
   #include <rpmio.h>
   #include <rpmcb.h>		/* XXX fnpyKey */
  -#include <header.h>
  +#include <rpmtag.h>
   #define	_RPMEVR_INTERNAL
   #include <rpmbuild.h>
   #include <argv.h>
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmfi.c
  ============================================================================
  $ cvs diff -u -r2.104 -r2.105 rpmfi.c
  --- rpm/lib/rpmfi.c	24 Nov 2007 23:15:32 -0000	2.104
  +++ rpm/lib/rpmfi.c	24 Nov 2007 23:55:01 -0000	2.105
  @@ -8,7 +8,7 @@
   #include <rpmio.h>
   #include <rpmcb.h>		/* XXX fnpyKey */
   #include <rpmurl.h>	/* XXX urlGetPath */
  -#include <header.h>
  +#include <header.h>		/* XXX headerFree, headerIsEntry, headerLink, headerMacrosLoad, headerMacrosUnload */
   #include <rpmlib.h>
   
   #include "cpio.h"	/* XXX CPIO_FOO */
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmgi.c
  ============================================================================
  $ cvs diff -u -r2.43 -r2.44 rpmgi.c
  --- rpm/lib/rpmgi.c	22 Nov 2007 22:28:14 -0000	2.43
  +++ rpm/lib/rpmgi.c	24 Nov 2007 23:55:01 -0000	2.44
  @@ -7,7 +7,7 @@
   #include <rpmio.h>
   #include <rpmcb.h>		/* XXX fnpyKey */
   #include <rpmmacro.h>		/* XXX rpmExpand */
  -#include <header.h>
  +#include <header.h>		/* XXX headerFree, headerLink. headerGetInstance */
   #include <rpmlib.h>
   #include <rpmte.h>		/* XXX rpmElementType */
   #include <pkgio.h>		/* XXX rpmElementType */
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpminstall.c
  ============================================================================
  $ cvs diff -u -r1.185 -r1.186 rpminstall.c
  --- rpm/lib/rpminstall.c	24 Nov 2007 22:07:28 -0000	1.185
  +++ rpm/lib/rpminstall.c	24 Nov 2007 23:55:01 -0000	1.186
  @@ -5,7 +5,7 @@
   #include "system.h"
   
   #include <rpmio.h>
  -#include <header.h>
  +#include <rpmtag.h>
   #include <rpmcli.h>
   
   #include "rpmdb.h"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmrollback.c
  ============================================================================
  $ cvs diff -u -r1.27 -r1.28 rpmrollback.c
  --- rpm/lib/rpmrollback.c	24 Nov 2007 22:07:28 -0000	1.27
  +++ rpm/lib/rpmrollback.c	24 Nov 2007 23:55:01 -0000	1.28
  @@ -5,7 +5,7 @@
   #include "system.h"
   
   #include <rpmio.h>
  -#include <header.h>
  +#include <header.h>		/* XXX headerFree, headerLink, headerIsEntry, headerGetOrigin */
   #include <rpmcli.h>
   
   #include "rpmdb.h"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmte.c
  ============================================================================
  $ cvs diff -u -r2.70 -r2.71 rpmte.c
  --- rpm/lib/rpmte.c	24 Nov 2007 22:07:28 -0000	2.70
  +++ rpm/lib/rpmte.c	24 Nov 2007 23:55:01 -0000	2.71
  @@ -6,7 +6,7 @@
   
   #include <rpmio.h>
   #include <rpmcb.h>		/* XXX fnpyKey */
  -#include <header.h>
  +#include <header.h>		/* XXX headerFree, headerLink. headerIsEntry */
   #include <rpmlib.h>
   
   #include "rpmds.h"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmts.c
  ============================================================================
  $ cvs diff -u -r2.125 -r2.126 rpmts.c
  --- rpm/lib/rpmts.c	24 Nov 2007 22:07:28 -0000	2.125
  +++ rpm/lib/rpmts.c	24 Nov 2007 23:55:01 -0000	2.126
  @@ -7,7 +7,7 @@
   #include "rpmio_internal.h"	/* XXX for pgp and beecrypt */
   #include <rpmcb.h>		/* XXX fnpyKey */
   #include <rpmmacro.h>		/* XXX rpmtsOpenDB() needs rpmGetPath */
  -#include <header.h>
  +#include <header.h>		/* XXX headerFree, headerLink */
   #include <rpmlib.h>
   
   #define	_RPMDB_INTERNAL		/* XXX almost opaque sigh */
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/transaction.c
  ============================================================================
  $ cvs diff -u -r1.356 -r1.357 transaction.c
  --- rpm/lib/transaction.c	24 Nov 2007 22:07:28 -0000	1.356
  +++ rpm/lib/transaction.c	24 Nov 2007 23:55:01 -0000	1.357
  @@ -6,7 +6,7 @@
   
   #include <rpmio.h>
   #include <rpmmacro.h>	/* XXX for rpmExpand */
  -#include <header.h>
  +#include <rpmtag.h>
   #include "rpmcli.h"	/* IDTX prototypes */
   
   #include "fsm.h"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/verify.c
  ============================================================================
  $ cvs diff -u -r2.178 -r2.179 verify.c
  --- rpm/lib/verify.c	22 Nov 2007 22:28:14 -0000	2.178
  +++ rpm/lib/verify.c	24 Nov 2007 23:55:01 -0000	2.179
  @@ -6,7 +6,7 @@
   #include "system.h"
   
   #include <rpmio.h>
  -#include <header.h>
  +#include <header.h>		/* XXX headerFree, headerLink, headerIsEntry */
   #define	_RPMPS_INTERNAL	/* XXX rpmps needs iterator. */
   #include <rpmcli.h>
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/python/rpmts-py.c
  ============================================================================
  $ cvs diff -u -r1.79 -r1.80 rpmts-py.c
  --- rpm/python/rpmts-py.c	22 Nov 2007 19:27:14 -0000	1.79
  +++ rpm/python/rpmts-py.c	24 Nov 2007 23:55:03 -0000	1.80
  @@ -6,6 +6,7 @@
   
   #include <rpmio_internal.h>	/* XXX for fdSetOpen */
   
  +#include <header.h>		/* XXX headerGetEntry, headerFree */
   #define	_RPMPS_INTERNAL	/* XXX almost (but not quite) opaque. */
   #include <rpmcli.h>
   #include <rpmpgp.h>
  @@ .