- next batch of patch updates

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

diff --git a/rpm-old-fileconflicts-behaviour.patch b/rpm-old-fileconflicts-behaviour.patch
deleted file mode 100644 (file)
index 1e59501..0000000
--- a/rpm-old-fileconflicts-behaviour.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 = {
--#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),