From: Michael Schroeder <mls@suse.de>
Date: Tue, 1 Sep 2015 11:45:57 +0000 (+0200)
Subject: get rid of RPMSENSE_RICH
X-Git-Tag: 0.6.12~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4782bc05b8b8e8ae6b8bf295ca4f2488e08edd76;p=thirdparty%2Flibsolv.git

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 c91e7d88..d3e559ef 100644
--- 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 71c69abf..d49f9d89 100644
--- 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)