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

--- 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),
Commit	Line	Data
73aa2dd5 ER	1	--- rpm-5.3.11/lib/poptI.c~ 2011-05-08 01:58:28.000000000 +0300
	2	+++ rpm-5.3.11/lib/poptI.c 2011-10-06 18:36:39.099587792 +0300
	3	@@ -21,7 +21,7 @@
ed809d1d	4	/@-fullinitblock@/
0de0d9a2	5	/@unchecked@/
ed809d1d	6	struct rpmQVKArguments_s rpmIArgs = {
205a62c5 JR	7	-#if defined(RPM_VENDOR_MANDRIVA) /* dont-filter-install-file-conflicts */
205a62c5 JR	8	+#if defined(RPM_VENDOR_MANDRIVA) \|\| defined(RPM_VENDOR_PLD) /* dont-filter-install-file-conflicts */
9282ffe4 AF	9	.probFilter = RPMPROB_FILTER_NONE,
	10	#else
	11	.probFilter = (RPMPROB_FILTER_REPLACEOLDFILES \| RPMPROB_FILTER_REPLACENEWFILES),