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 18:42:24
  Branch: HEAD                             Handle: 2007120317422400

  Modified files:
    rpm                     CHANGES
    rpm/lib                 rpmlib.h rpmps.h

  Log:
    - rpm.org: Move rpmprobFilterFlag enums to rpmps where they logically
    belong

  Summary:
    Revision    Changes     Path
    1.1917      +1  -0      rpm/CHANGES
    2.452       +0  -15     rpm/lib/rpmlib.h
    2.15        +16 -0      rpm/lib/rpmps.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1916 -r1.1917 CHANGES
  --- rpm/CHANGES	3 Dec 2007 17:37:22 -0000	1.1916
  +++ rpm/CHANGES	3 Dec 2007 17:42:24 -0000	1.1917
  @@ -1,4 +1,5 @@
   5.0a4 -> 5.0b1:
  +    - rpm.org: Move rpmprobFilterFlag enums to rpmps where they logically belong
       - rpm.org: Move rpmtransFlags enums to rpmts.h where it logically belongs.
       - jbj: hijack rse's versioning name space, add to *.rpm packages too.
       - jbj: fix: rpmbuild -ba dir/foo.spec was broken.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmlib.h
  ============================================================================
  $ cvs diff -u -r2.451 -r2.452 rpmlib.h
  --- rpm/lib/rpmlib.h	3 Dec 2007 17:37:23 -0000	2.451
  +++ rpm/lib/rpmlib.h	3 Dec 2007 17:42:24 -0000	2.452
  @@ -276,21 +276,6 @@
   /* ==================================================================== */
   /** \name RPMTS */
   /*@{*/
  -/**
  - * @todo Generalize filter mechanism.
  - */
  -typedef enum rpmprobFilterFlags_e {
  -    RPMPROB_FILTER_NONE		= 0,
  -    RPMPROB_FILTER_IGNOREOS	= (1 << 0),	/*!< from --ignoreos */
  -    RPMPROB_FILTER_IGNOREARCH	= (1 << 1),	/*!< from --ignorearch */
  -    RPMPROB_FILTER_REPLACEPKG	= (1 << 2),	/*!< from --replacepkgs */
  -    RPMPROB_FILTER_FORCERELOCATE= (1 << 3),	/*!< from --badreloc */
  -    RPMPROB_FILTER_REPLACENEWFILES= (1 << 4),	/*!< from --replacefiles */
  -    RPMPROB_FILTER_REPLACEOLDFILES= (1 << 5),	/*!< from --replacefiles */
  -    RPMPROB_FILTER_OLDPACKAGE	= (1 << 6),	/*!< from --oldpackage */
  -    RPMPROB_FILTER_DISKSPACE	= (1 << 7),	/*!< from --ignoresize */
  -    RPMPROB_FILTER_DISKNODES	= (1 << 8)	/*!< from --ignoresize */
  -} rpmprobFilterFlags;
   
   /**
    * We pass these around as an array with a sentinel.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmps.h
  ============================================================================
  $ cvs diff -u -r2.14 -r2.15 rpmps.h
  --- rpm/lib/rpmps.h	15 Nov 2007 20:26:04 -0000	2.14
  +++ rpm/lib/rpmps.h	3 Dec 2007 17:42:24 -0000	2.15
  @@ -26,6 +26,22 @@
   typedef /*@abstract@*/ struct rpmpsi_s * rpmpsi;
   
   /**
  + * @todo Generalize filter mechanism.
  + */
  +typedef enum rpmprobFilterFlags_e {
  +    RPMPROB_FILTER_NONE		= 0,
  +    RPMPROB_FILTER_IGNOREOS	= (1 << 0),	/*!< from --ignoreos */
  +    RPMPROB_FILTER_IGNOREARCH	= (1 << 1),	/*!< from --ignorearch */
  +    RPMPROB_FILTER_REPLACEPKG	= (1 << 2),	/*!< from --replacepkgs */
  +    RPMPROB_FILTER_FORCERELOCATE= (1 << 3),	/*!< from --badreloc */
  +    RPMPROB_FILTER_REPLACENEWFILES= (1 << 4),	/*!< from --replacefiles */
  +    RPMPROB_FILTER_REPLACEOLDFILES= (1 << 5),	/*!< from --replacefiles */
  +    RPMPROB_FILTER_OLDPACKAGE	= (1 << 6),	/*!< from --oldpackage */
  +    RPMPROB_FILTER_DISKSPACE	= (1 << 7),	/*!< from --ignoresize */
  +    RPMPROB_FILTER_DISKNODES	= (1 << 8)	/*!< from --ignoresize */
  +} rpmprobFilterFlags;
  +
  +/**
    * Enumerate transaction set problem types.
    */
   typedef enum rpmProblemType_e {
  @@ .