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:   10-Nov-2007 00:18:03
  Branch: HEAD                             Handle: 2007110923180101

  Modified files:
    rpm                     CHANGES
    rpm/lib                 cpio.c misc.c rpmfi.c

  Log:
    - rpm.org: Remove bunch of unnecessary rpmio_internal includes.

  Summary:
    Revision    Changes     Path
    1.1790      +1  -0      rpm/CHANGES
    2.134       +1  -1      rpm/lib/cpio.c
    2.147       +1  -1      rpm/lib/misc.c
    2.98        +2  -1      rpm/lib/rpmfi.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1789 -r1.1790 CHANGES
  --- rpm/CHANGES	9 Nov 2007 22:20:51 -0000	1.1789
  +++ rpm/CHANGES	9 Nov 2007 23:18:01 -0000	1.1790
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - rpm.org: Remove bunch of unnecessary rpmio_internal includes.
       - jbj: include rpmtag.h, not rpmlib.h, if only tag names are needed.
       - jbj: change int_32 to evrFlags and uint32_t in rpmfc.c and rpmds.c.
       - rpm.org: Remove two unnecessary legacy.h includes.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/cpio.c
  ============================================================================
  $ cvs diff -u -r2.133 -r2.134 cpio.c
  --- rpm/lib/cpio.c	30 Sep 2007 20:38:25 -0000	2.133
  +++ rpm/lib/cpio.c	9 Nov 2007 23:18:02 -0000	2.134
  @@ -9,7 +9,7 @@
   
   #include "system.h"
   
  -#include <rpmio_internal.h>
  +#include <rpmio.h>
   #include <rpmlib.h>
   
   #include "cpio.h"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/misc.c
  ============================================================================
  $ cvs diff -u -r2.146 -r2.147 misc.c
  --- rpm/lib/misc.c	9 Nov 2007 21:36:42 -0000	2.146
  +++ rpm/lib/misc.c	9 Nov 2007 23:18:02 -0000	2.147
  @@ -7,7 +7,7 @@
   /* just to put a marker in librpm.a */
   const char * RPMVERSION = VERSION;
   
  -#include "rpmio_internal.h"
  +#include <rpmio.h>
   #include <rpmurl.h>
   #include <rpmmacro.h>	/* XXX for rpmGetPath */
   #include <rpmlib.h>
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmfi.c
  ============================================================================
  $ cvs diff -u -r2.97 -r2.98 rpmfi.c
  --- rpm/lib/rpmfi.c	8 Nov 2007 18:08:26 -0000	2.97
  +++ rpm/lib/rpmfi.c	9 Nov 2007 23:18:02 -0000	2.98
  @@ -5,7 +5,8 @@
   
   #include "system.h"
   
  -#include <rpmio_internal.h>
  +#include <rpmio.h>
  +#include <rpmurl.h>	/* XXX urlGetPath */
   #include <rpmlib.h>
   
   #include "cpio.h"	/* XXX CPIO_FOO */
  @@ .