--- ./apt-pkg/rpm/rpmhandler.cc.orig	2007-08-17 12:49:37.000000000 +0200
+++ ./apt-pkg/rpm/rpmhandler.cc	2007-08-23 21:44:36.000000000 +0200
@@ -60,6 +60,12 @@
 #define rpmxxInitIterator(a,b,c,d) rpmdbInitIterator(a,b,c,d)
 #endif
 
+#if RPM_VERSION >= 0x040409 && !defined(_RPMEVR_INTERNAL)
+// rpmevr.h/evrFlags_e
+#define RPMSENSE_ANY 0
+#define RPMSENSE_MISSINGOK (1 << 19)
+#endif
+
 // An attempt to deal with false zero epochs from repomd. With older rpm's we
 // can only blindly trust the repo admin created the repository with options
 // suitable for those versions. For rpm >= 4.2.1 this is linked with
--- ./apt-pkg/rpm/rpmversion.cc.orig	2007-05-14 11:01:55.000000000 +0200
+++ ./apt-pkg/rpm/rpmversion.cc	2007-06-20 13:42:04.000000000 +0200
@@ -32,6 +32,11 @@
 #include <rpm/rpmds.h>
 #endif
 
+#if RPM_VERSION >= 0x040409 && !defined(_RPMEVR_INTERNAL)
+// rpmevr.h/evrFlags_e
+#define RPMSENSE_ANY 0
+#endif
+
 rpmVersioningSystem rpmVS;
 
 // rpmVS::rpmVersioningSystem - Constructor				/*{{{*/