RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 02-Jun-2011 19:39:41
Branch: rpm-5_4 Handle: 2011060217394100
Modified files: (Branch: rpm-5_4)
rpm/tools dbconvert.c
Log:
- dbconvert: fix: avoid RPMDB_DEPENDS build failures.
Summary:
Revision Changes Path
2.1.2.5 +5 -3 rpm/tools/dbconvert.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tools/dbconvert.c
============================================================================
$ cvs diff -u -r2.1.2.4 -r2.1.2.5 dbconvert.c
--- rpm/tools/dbconvert.c 10 Apr 2011 10:17:09 -0000 2.1.2.4
+++ rpm/tools/dbconvert.c 2 Jun 2011 17:39:41 -0000 2.1.2.5
@@ -4,14 +4,14 @@
#include <errno.h>
#include <stdint.h>
-#include <popt.h>
-
#define _RPMDB_INTERNAL
#define _RPMTAG_INTERNAL
#define WITH_DB
-#include <argv.h>
#include <rpmio.h>
+#include <poptIO.h>
+#include <argv.h>
+
#include <rpmtag.h>
#include <rpmdb.h>
#include <rpmmacro.h>
@@ -207,7 +207,9 @@
case RPMDBI_AVAILABLE:
case RPMDBI_ADDED:
case RPMDBI_REMOVED:
+#if defined(RPMDBI_DEPENDS)
case RPMDBI_DEPENDS:
+#endif
case RPMDBI_BTREE:
case RPMDBI_HASH:
case RPMDBI_QUEUE:
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
