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:   03-Dec-2007 19:22:32
  Branch: HEAD                             Handle: 2007120318223101

  Modified files:
    rpm                     CHANGES
    rpm/lib                 rpmfi.h rpmlib.h
    rpm/rpmdb               hdrfmt.c

  Log:
    - rpm.org: Move RPMFILE_* file attributes to rpmfi.h.

  Summary:
    Revision    Changes     Path
    1.1919      +1  -0      rpm/CHANGES
    2.47        +43 -0      rpm/lib/rpmfi.h
    2.454       +0  -43     rpm/lib/rpmlib.h
    1.51        +4  -1      rpm/rpmdb/hdrfmt.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1918 -r1.1919 CHANGES
  --- rpm/CHANGES	3 Dec 2007 18:11:08 -0000	1.1918
  +++ rpm/CHANGES	3 Dec 2007 18:22:31 -0000	1.1919
  @@ -1,4 +1,5 @@
   5.0a4 -> 5.0b1:
  +    - rpm.org: Move RPMFILE_* file attributes to rpmfi.h.
       - rpm.org: Move file action enums to rpmfi where they logically belong.
       - rpm.org: Move rpmprobFilterFlag enums to rpmps where they logically belong
       - rpm.org: Move rpmtransFlags enums to rpmts.h where it logically belongs.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmfi.h
  ============================================================================
  $ cvs diff -u -r2.46 -r2.47 rpmfi.h
  --- rpm/lib/rpmfi.h	3 Dec 2007 18:11:09 -0000	2.46
  +++ rpm/lib/rpmfi.h	3 Dec 2007 18:22:32 -0000	2.47
  @@ -29,6 +29,49 @@
   } rpmFileTypes;
   
   /**
  + * File States (when installed).
  + */
  +typedef enum rpmfileState_e {
  +    RPMFILE_STATE_NORMAL 	= 0,
  +    RPMFILE_STATE_REPLACED 	= 1,
  +    RPMFILE_STATE_NOTINSTALLED	= 2,
  +    RPMFILE_STATE_NETSHARED	= 3,
  +    RPMFILE_STATE_WRONGCOLOR	= 4
  +} rpmfileState;
  +#define	RPMFILE_STATE_MISSING	-1	/* XXX used for unavailable data */
  +
  +/**
  + * File Attributes.
  + */
  +typedef	enum rpmfileAttrs_e {
  +/*@-enummemuse@*/
  +    RPMFILE_NONE	= 0,
  +/*@=enummemuse@*/
  +    RPMFILE_CONFIG	= (1 <<  0),	/*!< from %%config */
  +    RPMFILE_DOC		= (1 <<  1),	/*!< from %%doc */
  +    RPMFILE_ICON	= (1 <<  2),	/*!< from Icon: */
  +    RPMFILE_MISSINGOK	= (1 <<  3),	/*!< from %%config(missingok) */
  +    RPMFILE_NOREPLACE	= (1 <<  4),	/*!< from %%config(noreplace) */
  +    RPMFILE_SPECFILE	= (1 <<  5),	/*!< the specfile (srpm only). */
  +    RPMFILE_GHOST	= (1 <<  6),	/*!< from %%ghost */
  +    RPMFILE_LICENSE	= (1 <<  7),	/*!< from %%license */
  +    RPMFILE_README	= (1 <<  8),	/*!< from %%readme */
  +    RPMFILE_EXCLUDE	= (1 <<  9),	/*!< from %%exclude, internal */
  +    RPMFILE_UNPATCHED	= (1 << 10),	/*!< (deprecated) placeholder (SuSE) */
  +    RPMFILE_PUBKEY	= (1 << 11),	/*!< from %%pubkey */
  +    RPMFILE_POLICY	= (1 << 12),	/*!< from %%policy */
  +    RPMFILE_EXISTS	= (1 << 13),	/*!< did lstat(fn, st) succeed? */
  +    RPMFILE_SPARSE	= (1 << 14),	/*!< was ((512*st->st_blocks) < st->st_size) ? */
  +    RPMFILE_TYPED	= (1 << 15),	/*!< (unimplemented) from %%spook */
  +    RPMFILE_SOURCE	= (1 << 16),	/*!< from SourceN: (srpm only). */
  +    RPMFILE_PATCH	= (1 << 17),	/*!< from PatchN: (srpm only). */
  +    RPMFILE_OPTIONAL	= (1 << 18)	/*!< from %%optional. */
  +} rpmfileAttrs;
  +
  +#define	RPMFILE_SPOOK	(RPMFILE_GHOST|RPMFILE_TYPED)
  +#define	RPMFILE_ALL	~(RPMFILE_NONE)
  +
  +/**
    * File disposition(s) during package install/erase transaction.
    */
   typedef enum fileAction_e {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmlib.h
  ============================================================================
  $ cvs diff -u -r2.453 -r2.454 rpmlib.h
  --- rpm/lib/rpmlib.h	3 Dec 2007 18:11:09 -0000	2.453
  +++ rpm/lib/rpmlib.h	3 Dec 2007 18:22:32 -0000	2.454
  @@ -153,49 +153,6 @@
       RPMSCRIPT_STATE_LUA		= (1 << 26)  /*!< scriptlet exec with lua */
   } rpmScriptState;
   
  -/**
  - * File States (when installed).
  - */
  -typedef enum rpmfileState_e {
  -    RPMFILE_STATE_NORMAL 	= 0,
  -    RPMFILE_STATE_REPLACED 	= 1,
  -    RPMFILE_STATE_NOTINSTALLED	= 2,
  -    RPMFILE_STATE_NETSHARED	= 3,
  -    RPMFILE_STATE_WRONGCOLOR	= 4
  -} rpmfileState;
  -#define	RPMFILE_STATE_MISSING	-1	/* XXX used for unavailable data */
  -
  -/**
  - * File Attributes.
  - */
  -typedef	enum rpmfileAttrs_e {
  -/*@-enummemuse@*/
  -    RPMFILE_NONE	= 0,
  -/*@=enummemuse@*/
  -    RPMFILE_CONFIG	= (1 <<  0),	/*!< from %%config */
  -    RPMFILE_DOC		= (1 <<  1),	/*!< from %%doc */
  -    RPMFILE_ICON	= (1 <<  2),	/*!< from Icon: */
  -    RPMFILE_MISSINGOK	= (1 <<  3),	/*!< from %%config(missingok) */
  -    RPMFILE_NOREPLACE	= (1 <<  4),	/*!< from %%config(noreplace) */
  -    RPMFILE_SPECFILE	= (1 <<  5),	/*!< the specfile (srpm only). */
  -    RPMFILE_GHOST	= (1 <<  6),	/*!< from %%ghost */
  -    RPMFILE_LICENSE	= (1 <<  7),	/*!< from %%license */
  -    RPMFILE_README	= (1 <<  8),	/*!< from %%readme */
  -    RPMFILE_EXCLUDE	= (1 <<  9),	/*!< from %%exclude, internal */
  -    RPMFILE_UNPATCHED	= (1 << 10),	/*!< (deprecated) placeholder (SuSE) */
  -    RPMFILE_PUBKEY	= (1 << 11),	/*!< from %%pubkey */
  -    RPMFILE_POLICY	= (1 << 12),	/*!< from %%policy */
  -    RPMFILE_EXISTS	= (1 << 13),	/*!< did lstat(fn, st) succeed? */
  -    RPMFILE_SPARSE	= (1 << 14),	/*!< was ((512*st->st_blocks) < st->st_size) ? */
  -    RPMFILE_TYPED	= (1 << 15),	/*!< (unimplemented) from %%spook */
  -    RPMFILE_SOURCE	= (1 << 16),	/*!< from SourceN: (srpm only). */
  -    RPMFILE_PATCH	= (1 << 17),	/*!< from PatchN: (srpm only). */
  -    RPMFILE_OPTIONAL	= (1 << 18)	/*!< from %%optional. */
  -} rpmfileAttrs;
  -
  -#define	RPMFILE_SPOOK	(RPMFILE_GHOST|RPMFILE_TYPED)
  -#define	RPMFILE_ALL	~(RPMFILE_NONE)
  -
   /* ==================================================================== */
   /** \name RPMRC */
   /*@{*/
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/hdrfmt.c
  ============================================================================
  $ cvs diff -u -r1.50 -r1.51 hdrfmt.c
  --- rpm/rpmdb/hdrfmt.c	3 Dec 2007 14:42:04 -0000	1.50
  +++ rpm/rpmdb/hdrfmt.c	3 Dec 2007 18:22:32 -0000	1.51
  @@ -9,7 +9,10 @@
   #include <rpmmacro.h>	/* XXX for %_i18ndomains */
   
   #define	_RPMTAG_INTERNAL
  -#include <rpmlib.h>	/* XXX RPMFILE_FOO, rpmMkdirPath */
  +#include <rpmtag.h>
  +
  +#include <rpmlib.h>	/* XXX rpmfi, rpmMkdirPath */
  +#include <rpmfi.h>	/* XXX RPMFILE_FOO */
   
   #define _RPMEVR_INTERNAL
   #include <rpmevr.h>	/* XXX RPMSENSE_FOO */
  @@ .