Update to 4.11.0.1

[platform/upstream/rpm.git] / lib / rpmds.h

diff --git a/lib/rpmds.h b/lib/rpmds.h
index 75c1541..bceed00 100644 (file)
--- a/lib/rpmds.h
+++ b/lib/rpmds.h
@@ -27,7 +27,8 @@ enum rpmsenseFlags_e {
     RPMSENSE_LESS      = (1 << 1),
     RPMSENSE_GREATER   = (1 << 2),
     RPMSENSE_EQUAL     = (1 << 3),
-    /* bits 4-5 unused */
+    /* bit 4 unused */
+    RPMSENSE_POSTTRANS = (1 << 5),     /*!< %posttrans dependency */
     RPMSENSE_PREREQ    = (1 << 6),     /* legacy prereq dependency */
     RPMSENSE_PRETRANS  = (1 << 7),     /*!< Pre-transaction dependency. */
     RPMSENSE_INTERP    = (1 << 8),     /*!< Interpreter used by scriptlet. */
@@ -47,7 +48,7 @@ enum rpmsenseFlags_e {
     RPMSENSE_RPMLIB = (1 << 24),       /*!< rpmlib(feature) dependency. */
     RPMSENSE_TRIGGERPREIN = (1 << 25), /*!< %triggerprein dependency. */
     RPMSENSE_KEYRING   = (1 << 26),
-    /* bit 27 unused */
+    RPMSENSE_STRONG     = (1 << 27),
     RPMSENSE_CONFIG    = (1 << 28)
 };
 
@@ -70,11 +71,14 @@ typedef rpmFlags rpmsenseFlags;
     RPMSENSE_RPMLIB | \
     RPMSENSE_KEYRING | \
     RPMSENSE_PRETRANS | \
-    RPMSENSE_PREREQ)
+    RPMSENSE_POSTTRANS | \
+    RPMSENSE_PREREQ | \
+    RPMSENSE_MISSINGOK | \
+    RPMSENSE_STRONG)
 
 #define        _notpre(_x)             ((_x) & ~RPMSENSE_PREREQ)
 #define        _INSTALL_ONLY_MASK \
-    _notpre(RPMSENSE_SCRIPT_PRE|RPMSENSE_SCRIPT_POST|RPMSENSE_RPMLIB|RPMSENSE_KEYRING|RPMSENSE_PRETRANS)
+    _notpre(RPMSENSE_SCRIPT_PRE|RPMSENSE_SCRIPT_POST|RPMSENSE_RPMLIB|RPMSENSE_KEYRING|RPMSENSE_PRETRANS|RPMSENSE_POSTTRANS)
 #define        _ERASE_ONLY_MASK  \
     _notpre(RPMSENSE_SCRIPT_PREUN|RPMSENSE_SCRIPT_POSTUN)
 
@@ -95,6 +99,7 @@ rpmds rpmdsLink(rpmds ds);
  * @return             NULL always
  */
 rpmds rpmdsFree(rpmds ds);
+
 /** \ingroup rpmds
  * Create and load a dependency set.
  * @param h            header
@@ -308,6 +313,16 @@ int rpmdsCompare(const rpmds A, const rpmds B);
 int rpmdsAnyMatchesDep (const Header h, const rpmds req, int nopromote);
 
 /** \ingroup rpmds
+ * Compare package provides dependencies from header with a single dependency.
+ * @param h            header
+ * @param ix            index in header provides
+ * @param req          dependency set
+ * @param nopromote    Don't promote Epoch: in comparison?
+ * @return             1 if any dependency overlaps, 0 otherwise
+ */
+int rpmdsMatchesDep (const Header h, int ix, const rpmds req, int nopromote);
+
+/** \ingroup rpmds
  * Compare package name-version-release from header with a single dependency.
  * @param h            header
  * @param req          dependency set