-- .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),