- rpmdb.h fixes

Changed files:
    rpm-branch.patch -> 1.3

diff --git a/rpm-branch.patch b/rpm-branch.patch
index fd5408d64970f4addfee63243d0cd56a598febfc..3be90112810d799d4daedb7b81c2979098871315 100644 (file)
--- a/rpm-branch.patch
+++ b/rpm-branch.patch
@@ -66,6 +66,26 @@ diff -u -u -r1.32 -r1.33
  
  /**
   * Supported URL types.
+
+Index: rpm/rpmdb/rpmdb.h
+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 @@
+ #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
++#endif
+ 
+ /*@-exportlocal@*/
+ /*@unchecked@*/
 diff -urN rpm-5.1.4/lib/rpmfc.c rpm-5.1.4.new/lib/rpmfc.c
 --- rpm-5.1.4/lib/rpmfc.c      2008-04-06 10:48:08.000000000 +0200
 +++ rpm-5.1.4.new/lib/rpmfc.c  2008-07-29 21:02:21.000000000 +0200