13 lines
601 B
Diff
13 lines
601 B
Diff
|
diff -ru rpm-5.2.1.orig/lib//poptI.c rpm-5.2.1/lib/poptI.c
|
||
|
|
--- rpm-5.2.1.orig/lib//poptI.c 2009-04-11 16:47:13.000000000 +0200
|
||
|
|
+++ rpm-5.2.1/lib/poptI.c 2010-07-26 15:35:13.285484268 +0200
|
||
|
|
@@ -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_OPENMAMBA) /* dont-filter-install-file-conflicts */
|
||
|
|
.probFilter = RPMPROB_FILTER_NONE,
|
||
|
|
#else
|
||
|
|
.probFilter = (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
|