Move RPMFILE_* file attributes to rpmfi.h

diff --git a/lib/rpmcli.h b/lib/rpmcli.h
index 37272be..9b1ffda 100644 (file)
--- a/lib/rpmcli.h
+++ b/lib/rpmcli.h
@@ -9,6 +9,7 @@
 #include <rpmurl.h>
 #include <rpmmacro.h>
 #include <rpmcallback.h>
+#include <rpmfi.h>
 #include <argv.h>
 
 #ifdef __cplusplus

diff --git a/lib/rpmfi.h b/lib/rpmfi.h
index cd4bf2d..b77b074 100644 (file)
--- a/lib/rpmfi.h
+++ b/lib/rpmfi.h
@@ -43,6 +43,28 @@ typedef enum rpmfileState_e {
 } rpmfileState;
 #define        RPMFILE_STATE_MISSING   -1      /* XXX used for unavailable data */
 
+/**
+ * File Attributes.
+ */
+typedef        enum rpmfileAttrs_e {
+    RPMFILE_NONE       = 0,
+    RPMFILE_CONFIG     = (1 <<  0),    /*!< from %%config */
+    RPMFILE_DOC                = (1 <<  1),    /*!< from %%doc */
+    RPMFILE_ICON       = (1 <<  2),    /*!< from %%donotuse. */
+    RPMFILE_MISSINGOK  = (1 <<  3),    /*!< from %%config(missingok) */
+    RPMFILE_NOREPLACE  = (1 <<  4),    /*!< from %%config(noreplace) */
+    RPMFILE_SPECFILE   = (1 <<  5),    /*!< @todo (unnecessary) marks 1st file in srpm. */
+    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),    /*!< placeholder (SuSE) */
+    RPMFILE_PUBKEY     = (1 << 11),    /*!< from %%pubkey */
+    RPMFILE_POLICY     = (1 << 12)     /*!< from %%policy */
+} rpmfileAttrs;
+
+#define        RPMFILE_ALL     ~(RPMFILE_NONE)
+
 /** \ingroup rpmfi
  * Unreference a file info set instance.
  * @param fi           file info set

diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 9269f4e..3a3d0f4 100644 (file)
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -373,28 +373,6 @@ typedef enum rpmTag_e {
 
 #define        RPMTAG_EXTERNAL_TAG             1000000
 
-/**
- * File Attributes.
- */
-typedef        enum rpmfileAttrs_e {
-    RPMFILE_NONE       = 0,
-    RPMFILE_CONFIG     = (1 <<  0),    /*!< from %%config */
-    RPMFILE_DOC                = (1 <<  1),    /*!< from %%doc */
-    RPMFILE_ICON       = (1 <<  2),    /*!< from %%donotuse. */
-    RPMFILE_MISSINGOK  = (1 <<  3),    /*!< from %%config(missingok) */
-    RPMFILE_NOREPLACE  = (1 <<  4),    /*!< from %%config(noreplace) */
-    RPMFILE_SPECFILE   = (1 <<  5),    /*!< @todo (unnecessary) marks 1st file in srpm. */
-    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),    /*!< placeholder (SuSE) */
-    RPMFILE_PUBKEY     = (1 << 11),    /*!< from %%pubkey */
-    RPMFILE_POLICY     = (1 << 12)     /*!< from %%policy */
-} rpmfileAttrs;
-
-#define        RPMFILE_ALL     ~(RPMFILE_NONE)
-
 /** \ingroup rpmds
  * Dependency Attributes.
  */