RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ CHANGES rpm/build/ parsePrep.c rpm/rpmdb/ db3.c dbconf...

From: Jeff Johnson <jbj@rpm5.org>
Date: Fri 09 Nov 2007 - 23:20:52 CET
Message-Id: <20071109222052.5E1B6348477@rpm5.org>
  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:   09-Nov-2007 23:20:52
  Branch: HEAD                             Handle: 2007110922205100

  Modified files:
    rpm                     CHANGES
    rpm/build               parsePrep.c
    rpm/rpmdb               db3.c dbconfig.c hdrNVR.c hdrfmt.c legacy.c
                            pkgio.c signature.c sqlite.c tagname.c

  Log:
    - jbj: include rpmtag.h, not rpmlib.h, if only tag names are needed.

  Summary:
    Revision    Changes     Path
    1.1789      +1  -0      rpm/CHANGES
    2.92        +1  -1      rpm/build/parsePrep.c
    1.77        +1  -1      rpm/rpmdb/db3.c
    1.47        +1  -1      rpm/rpmdb/dbconfig.c
    1.26        +1  -1      rpm/rpmdb/hdrNVR.c
    1.29        +1  -1      rpm/rpmdb/hdrfmt.c
    1.35        +1  -1      rpm/rpmdb/legacy.c
    1.24        +1  -1      rpm/rpmdb/pkgio.c
    1.17        +1  -1      rpm/rpmdb/signature.c
    1.20        +1  -1      rpm/rpmdb/sqlite.c
    1.7         +1  -1      rpm/rpmdb/tagname.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1788 -r1.1789 CHANGES
  --- rpm/CHANGES	9 Nov 2007 21:59:44 -0000	1.1788
  +++ rpm/CHANGES	9 Nov 2007 22:20:51 -0000	1.1789
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - 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.
       - rpm.org: Remove bunch of unnecessary misc.h includes, document others.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/parsePrep.c
  ============================================================================
  $ cvs diff -u -r2.91 -r2.92 parsePrep.c
  --- rpm/build/parsePrep.c	3 Nov 2007 23:43:59 -0000	2.91
  +++ rpm/build/parsePrep.c	9 Nov 2007 22:20:51 -0000	2.92
  @@ -5,7 +5,7 @@
   
   #include "system.h"
   
  -#include <rpmio_internal.h>
  +#include <rpmio.h>
   #include <rpmbuild.h>
   #include "debug.h"
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/db3.c
  ============================================================================
  $ cvs diff -u -r1.76 -r1.77 db3.c
  --- rpm/rpmdb/db3.c	11 Oct 2007 19:44:24 -0000	1.76
  +++ rpm/rpmdb/db3.c	9 Nov 2007 22:20:51 -0000	1.77
  @@ -12,7 +12,7 @@
   #include <sys/ipc.h>
   #endif
   
  -#include <rpmlib.h>
  +#include <rpmtag.h>
   #include <rpmio.h>
   #include <rpmmacro.h>
   #include <rpmurl.h>	/* XXX urlPath proto */
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/dbconfig.c
  ============================================================================
  $ cvs diff -u -r1.46 -r1.47 dbconfig.c
  --- rpm/rpmdb/dbconfig.c	11 Oct 2007 13:04:28 -0000	1.46
  +++ rpm/rpmdb/dbconfig.c	9 Nov 2007 22:20:51 -0000	1.47
  @@ -4,7 +4,7 @@
   
   #include "system.h"
   
  -#include <rpmlib.h>
  +#include <rpmtag.h>
   #include <rpmio.h>
   #include <rpmmacro.h>
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/hdrNVR.c
  ============================================================================
  $ cvs diff -u -r1.25 -r1.26 hdrNVR.c
  --- rpm/rpmdb/hdrNVR.c	8 Nov 2007 17:14:56 -0000	1.25
  +++ rpm/rpmdb/hdrNVR.c	9 Nov 2007 22:20:51 -0000	1.26
  @@ -3,7 +3,7 @@
    */
   
   #include "system.h"
  -#include <rpmlib.h>
  +#include <rpmtag.h>
   #include <rpmio.h>
   #include <rpmmacro.h>
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/hdrfmt.c
  ============================================================================
  $ cvs diff -u -r1.28 -r1.29 hdrfmt.c
  --- rpm/rpmdb/hdrfmt.c	8 Nov 2007 15:15:40 -0000	1.28
  +++ rpm/rpmdb/hdrfmt.c	9 Nov 2007 22:20:51 -0000	1.29
  @@ -5,7 +5,7 @@
   #include "system.h"
   
   #include "rpmio_internal.h"
  -#include <rpmlib.h>
  +#include <rpmlib.h>	/* XXX RPMFILE_FOO, rpmMkdirPath */
   #include <rpmmacro.h>	/* XXX for %_i18ndomains */
   
   #define _RPMEVR_INTERNAL
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/legacy.c
  ============================================================================
  $ cvs diff -u -r1.34 -r1.35 legacy.c
  --- rpm/rpmdb/legacy.c	30 Sep 2007 17:29:05 -0000	1.34
  +++ rpm/rpmdb/legacy.c	9 Nov 2007 22:20:51 -0000	1.35
  @@ -26,7 +26,7 @@
   #endif
   
   #include "rpmio_internal.h"
  -#include <rpmlib.h>
  +#include <rpmlib.h>	/* XXX rpmMkdirPath */
   #include <rpmmacro.h>
   #include "misc.h"
   #include "legacy.h"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/pkgio.c
  ============================================================================
  $ cvs diff -u -r1.23 -r1.24 pkgio.c
  --- rpm/rpmdb/pkgio.c	9 Nov 2007 21:04:36 -0000	1.23
  +++ rpm/rpmdb/pkgio.c	9 Nov 2007 22:20:51 -0000	1.24
  @@ -16,7 +16,7 @@
   #endif
   
   #include <rpmio_internal.h>
  -#include <rpmlib.h>
  +#include <rpmtag.h>
   
   #include <rpmdb.h>		/* XXX rpmtsFindPubkey */
   #include <rpmmacro.h>
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/signature.c
  ============================================================================
  $ cvs diff -u -r1.16 -r1.17 signature.c
  --- rpm/rpmdb/signature.c	8 Nov 2007 15:15:40 -0000	1.16
  +++ rpm/rpmdb/signature.c	9 Nov 2007 22:20:51 -0000	1.17
  @@ -8,7 +8,7 @@
   #endif
   
   #include "rpmio_internal.h"
  -#include <rpmlib.h>
  +#include <rpmtag.h>
   #include <rpmmacro.h>	/* XXX for rpmGetPath() */
   #include "rpmdb.h"
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/sqlite.c
  ============================================================================
  $ cvs diff -u -r1.19 -r1.20 sqlite.c
  --- rpm/rpmdb/sqlite.c	8 Nov 2007 15:15:40 -0000	1.19
  +++ rpm/rpmdb/sqlite.c	9 Nov 2007 22:20:51 -0000	1.20
  @@ -35,7 +35,7 @@
   
   #include "system.h"
   
  -#include <rpmlib.h>
  +#include <rpmtag.h>
   #include <rpmio.h>
   #include <rpmmacro.h>
   #include <rpmurl.h>     /* XXX urlPath proto */
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/tagname.c
  ============================================================================
  $ cvs diff -u -r1.6 -r1.7 tagname.c
  --- rpm/rpmdb/tagname.c	30 Sep 2007 17:29:05 -0000	1.6
  +++ rpm/rpmdb/tagname.c	9 Nov 2007 22:20:51 -0000	1.7
  @@ -4,7 +4,7 @@
   
   #include "system.h"
   
  -#include <rpmlib.h>
  +#include <rpmtag.h>
   #include <rpmio.h>
   #include "debug.h"
   
  @@ .
Received on Fri Nov 9 23:20:52 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.