X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-old-fileconflicts-behaviour.patch;h=ad163a69db7f76edab0535aa838893b0b55230f8;hb=73f65316c81cb411a5c176a83cc680b553279064;hp=1535409eb0ee79a896b6bd0289faedfc9a008ebe;hpb=0de0d9a23b415a8928d11ea7a5aefdcf7566d6d2;p=packages%2Frpm.git

diff --git a/rpm-old-fileconflicts-behaviour.patch b/rpm-old-fileconflicts-behaviour.patch
index 1535409..ad163a6 100644
--- a/rpm-old-fileconflicts-behaviour.patch
+++ b/rpm-old-fileconflicts-behaviour.patch
@@ -1,22 +1,23 @@
---- 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 @@
+--- 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 @@
+ /*@-fullinitblock@*/
  /*@unchecked@*/
- struct rpmInstallArguments_s rpmIArgs = {
-     0,			/* transFlags */
--			/* probFilter */
--    (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
-+    0,			/* probFilter */
-     0,			/* installInterfaceFlags */
-     0,			/* eraseInterfaceFlags */
-     0,			/* qva_flags */
-@@ -274,9 +273,6 @@
+ 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},
-  { "force", '\0', 0, NULL, RPMCLI_POPT_FORCE,
- 	N_("short hand for --replacepkgs --replacefiles"), NULL},
- 
+-
+  { "freshen", 'F', POPT_BIT_SET, &rpmIArgs.installInterfaceFlags,
+ 	(INSTALL_UPGRADE|INSTALL_FRESHEN|INSTALL_INSTALL),
+ 	N_("upgrade package(s) if already installed"),
+