X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=rpm-old-fileconflicts-behaviour.patch;h=1e595010aadbf8af26a3d7f4b313125e801b6608;hb=4a1b849efcf4311f0687a32d339de92f82914242;hp=9869de2093478dcc708af3114e965cff94c046fc;hpb=ed809d1d4f61edb01b21523b99f09fdf7b9f02db;p=packages%2Frpm.git

diff --git a/rpm-old-fileconflicts-behaviour.patch b/rpm-old-fileconflicts-behaviour.patch
index 9869de2..1e59501 100644
--- a/rpm-old-fileconflicts-behaviour.patch
+++ b/rpm-old-fileconflicts-behaviour.patch
@@ -1,21 +1,11 @@
---- rpm-4.4.4/lib/poptI.c.orig	2005-11-27 13:50:16.000000000 +0000
-+++ rpm-4.4.4/lib/poptI.c	2005-12-28 02:43:01.029574304 +0000
-@@ -16,7 +16,7 @@
+--- rpm-5.3.11/lib/poptI.c~	2011-05-08 01:58:28.000000000 +0300
++++ rpm-5.3.11/lib/poptI.c	2011-10-06 18:36:39.099587792 +0300
+@@ -21,7 +21,7 @@
  /*@-fullinitblock@*/
  /*@unchecked@*/
  struct rpmQVKArguments_s rpmIArgs = {
--    .probFilter = (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
-+    .probFilter = 0,
- };
- /*@=fullinitblock@*/
- 
-@@ -274,9 +273,6 @@
- 	N_("skip files with leading component <path> "),
- 	N_("<path>") },
- 
-- { "fileconflicts", '\0', POPT_BIT_CLR, &rpmIArgs.probFilter,
--	(RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
--	N_("detect file conflicts between packages"), NULL},
-  { "force", '\0', 0, NULL, RPMCLI_POPT_FORCE,
- 	N_("short hand for --replacepkgs --replacefiles"), NULL},
- 
+-#if defined(RPM_VENDOR_MANDRIVA) /* dont-filter-install-file-conflicts */
++#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_PLD) /* dont-filter-install-file-conflicts */
+     .probFilter = RPMPROB_FILTER_NONE,
+ #else
+     .probFilter = (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),