- use popt 1.10.8, db 4.5.20

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

diff --git a/rpm-old-fileconflicts-behaviour.patch b/rpm-old-fileconflicts-behaviour.patch
index 1535409eb0ee79a896b6bd0289faedfc9a008ebe..9869de2093478dcc708af3114e965cff94c046fc 100644 (file)
--- a/rpm-old-fileconflicts-behaviour.patch
+++ b/rpm-old-fileconflicts-behaviour.patch
@@ -1,15 +1,14 @@
 --- rpm-4.4.4/lib/poptI.c.orig 2005-11-27 13:50:16.000000000 +0000
 +++ rpm-4.4.4/lib/poptI.c      2005-12-28 02:43:01.029574304 +0000
-@@ -16,8 +16,7 @@
+@@ -16,7 +16,7 @@
+ /*@-fullinitblock@*/
  /*@unchecked@*/
- struct rpmInstallArguments_s rpmIArgs = {
-     0,                        /* transFlags */
--                      /* probFilter */
--    (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
-+    0,                        /* probFilter */
-     0,                        /* installInterfaceFlags */
-     0,                        /* eraseInterfaceFlags */
-     0,                        /* qva_flags */
+ struct rpmQVKArguments_s rpmIArgs = {
+-    .probFilter = (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
++    .probFilter = 0,
+ };
+ /*@=fullinitblock@*/
+ 
 @@ -274,9 +273,6 @@
        N_("skip files with leading component <path> "),
        N_("<path>") },