rpms/rpm/devel rpm-4.4.1-fileconflicts.patch,NONE,1.1

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14843

Added Files:
	rpm-4.4.1-fileconflicts.patch 
Log Message:
Patch to revert to file conflicts behaviour


rpm-4.4.1-fileconflicts.patch:
 poptI.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

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