- force rpm to prefer x32 color on x32

[packages/rpm.git] / rpm-old-fileconflicts-behaviour.patch

diff --git a/rpm-old-fileconflicts-behaviour.patch b/rpm-old-fileconflicts-behaviour.patch
index ad163a69db7f76edab0535aa838893b0b55230f8..1e595010aadbf8af26a3d7f4b313125e801b6608 100644 (file)
--- a/rpm-old-fileconflicts-behaviour.patch
+++ b/rpm-old-fileconflicts-behaviour.patch
@@ -1,23 +1,11 @@
---- rpm/lib/poptI.c.orig       2007-07-24 16:36:47.000000000 +0200
-+++ rpm/lib/poptI.c    2007-10-02 15:11:29.213848100 +0200
-@@ -17,7 +17,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@*/
- 
-@@ -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),