diff -u -u -r1.75 -r1.73.2.2
--- rpm/rpmdb/rpmdb.h 29 Jul 2008 14:54:30 -0000 1.75
+++ rpm/rpmdb/rpmdb.h 29 Jul 2008 16:08:18 -0000 1.73.2.2
-@@ -10,7 +10,13 @@
+@@ -10,11 +10,13 @@
#include <assert.h>
#include <rpmlib.h>
#include <mire.h>
--#include <db.h>
+#if defined(_RPMDB_INTERNAL)
-+#if defined(WITH_DB)
-+#include "db.h"
-+#else
-+#include "db_emu.h"
-+#endif
+ #if defined(WITH_DB)
+ #include "db.h"
+ #else
+ #include "db_emu.h"
+ #endif
+#endif
/*@-exportlocal@*/
{ "current ar archive", RPMFC_STATIC|RPMFC_LIBRARY|RPMFC_ARCHIVE|RPMFC_INCLUDE },
+--- rpm/lib/depends.c~ 2008-06-15 10:57:22.000000000 +0200
++++ rpm/lib/depends.c 2008-07-29 22:03:37.336792223 +0200
+@@ -15,9 +15,7 @@
+
+ /* XXX CACHE_DEPENDENCY_RESULT deprecated, functionality being reimplemented */
+ #undef CACHE_DEPENDENCY_RESULT
+-#if defined(CACHE_DEPNDENCY_RESULT)
+-#define _RPMDB_INTERNAL /* XXX response cache needs dbiOpen et al. */
+-#endif
++#define _RPMDB_INTERNAL /* XXX response cache needs dbiOpen et al. DBT used below */
+ #include "rpmdb.h"
+
+ #define _RPMEVR_INTERNAL