get rid of RPMSENSE_RICH

also lowercase and/or/if/else, this seems to be currently prefered.

diff --git a/ext/pool_parserpmrichdep.c b/ext/pool_parserpmrichdep.c
index c91e7d8855e6889272db364ef636a16d1473df95..d3e559ef6a825bae629ab85c3d1d768058f4cece 100644 (file)
--- a/ext/pool_parserpmrichdep.c
+++ b/ext/pool_parserpmrichdep.c
@@ -17,14 +17,10 @@ static struct RichOpComp {
   int l;
   Id fl;
 } RichOps[] = {
-  { "&&", 2, REL_AND },
-  { "&", 1, REL_AND },
-  { "AND", 3, REL_AND },
-  { "||", 2, REL_OR },
-  { "|", 1, REL_OR },
-  { "OR", 2, REL_OR },
-  { "IF", 2, REL_COND },
-  { "ELSE", 4, REL_ELSE },
+  { "and",  3, REL_AND },
+  { "or",   2, REL_OR },
+  { "if",   2, REL_COND },
+  { "else", 4, REL_ELSE },
   { NULL, 0, 0},
 };
 

diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c
index 71c69abf83d06a64721a1ac16726629c3d8b7e88..d49f9d893c9607d9eb1b719b9b2ebe08809db635 100644 (file)
--- a/ext/repo_rpmdb.c
+++ b/ext/repo_rpmdb.c
@@ -150,7 +150,6 @@
 #define DEP_STRONG             (1 << 27)
 #define DEP_PRE_IN             ((1 << 6) | (1 << 9) | (1 << 10))
 #define DEP_PRE_UN             ((1 << 6) | (1 << 11) | (1 << 12))
-#define DEP_RICH               (1 << 29)
 
 #define FILEFLAG_GHOST         (1 <<  6)
 
@@ -537,7 +536,7 @@ makedeps(Pool *pool, Repo *repo, RpmHead *rpmhead, int tagn, int tagv, int tagf,
        if (!strncmp(n[i], "rpmlib(", 7))
          continue;
 #ifdef ENABLE_COMPLEX_DEPS
-      if ((f[i] & (DEP_RICH|DEP_LESS| DEP_EQUAL|DEP_GREATER)) == DEP_RICH && n[i][0] == '(')
+      if ((f[i] & (DEP_LESS|DEP_EQUAL|DEP_GREATER)) == 0 && n[i][0] == '(')
        {
          id = pool_parserpmrichdep(pool, n[i]);
          if (id)