-- .probFilter = (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
-+ .probFilter = 0,
- };
- /*@=fullinitblock@*/
-
-@@ -275,10 +275,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},
--
- { "freshen", 'F', POPT_BIT_SET, &rpmIArgs.installInterfaceFlags,
- (INSTALL_UPGRADE|INSTALL_FRESHEN|INSTALL_INSTALL),
- N_("upgrade package(s) if already installed"),
-
+-#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),