Paul Nasrat e52007
--- rpm-4.4.1/lib/poptI.c.conflicts	2005-03-21 10:19:45.000000000 +0000
Paul Nasrat e52007
+++ rpm-4.4.1/lib/poptI.c	2005-03-21 10:19:52.000000000 +0000
Paul Nasrat e52007
@@ -16,8 +16,7 @@
Paul Nasrat e52007
 /*@unchecked@*/
Paul Nasrat e52007
 struct rpmInstallArguments_s rpmIArgs = {
Paul Nasrat e52007
     0,			/* transFlags */
Paul Nasrat e52007
-			/* probFilter */
Paul Nasrat e52007
-    (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
Paul Nasrat e52007
+    0,			/* probFilter */
Paul Nasrat e52007
     0,			/* installInterfaceFlags */
Paul Nasrat e52007
     0,			/* eraseInterfaceFlags */
Paul Nasrat e52007
     0,			/* qva_flags */