SOURCES: rpm-branch.patch - rpmdb.h fixes

[arekm]

Author: arekm                        Date: Tue Jul 29 19:47:36 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- rpmdb.h fixes

---- Files affected:
SOURCES:
   rpm-branch.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/rpm-branch.patch
diff -u SOURCES/rpm-branch.patch:1.2 SOURCES/rpm-branch.patch:1.3
--- SOURCES/rpm-branch.patch:1.2	Tue Jul 29 21:34:20 2008
+++ SOURCES/rpm-branch.patch	Tue Jul 29 21:47:30 2008
@@ -66,6 +66,26 @@
  
  /**
   * 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-branch.patch?r1=1.2&r2=1.3&f=u