remove --noorder option during package removal

[packages/poldek.git] / poldek-config.patch

diff --git a/poldek-config.patch b/poldek-config.patch
index 7143512ec6072982e80fe1d9a93cd336aacacf7b..f89f30478bbbc9426ea3b1530a85558880c87c5e 100644 (file)
--- a/poldek-config.patch
+++ b/poldek-config.patch
@@ -1,31 +1,6 @@
---- poldek-0.30/doc/poldek.conf.xml    2012-04-04 11:37:12.737381529 +0300
-+++ poldek-0.30/doc/poldek.conf.xml    2012-04-04 11:38:47.231352866 +0300
-@@ -369,7 +369,7 @@
-     </description>
-   </option>
- 
--  <option name="choose equivalents manually" type="boolean" default="no" op="EQPKG_ASKUSER">
-+  <option name="choose equivalents manually" type="boolean" default="yes" op="EQPKG_ASKUSER">
-     <description>
-     Let the user select package among equivalents.
-     </description>
-@@ -598,7 +598,7 @@
-     </description>
-   </option>
- 
--  <option name="hold" type="string" list="yes" default="" multiple="yes">
-+  <option name="hold" type="string" list="yes" default="kernel*" multiple="yes">
-     <description>
-     Have the same meaning as [ global ] parameter. Example:
-     [screen]
---- poldek-0.30/conf/poldek.conf~      2010-08-22 14:19:51.000000000 +0300
-+++ poldek-0.30/conf/poldek.conf       2010-08-22 14:20:28.524878981 +0300
-@@ -127,11 +127,11 @@
- #confirm removal = yes
- 
- # Let the user select package among equivalents.
--#choose equivalents manually = no
-+choose equivalents manually = yes
+--- poldek-0.30.0/conf/poldek.conf     2013-07-08 14:19:35.294351501 +0300
++++ poldek-0.30.0/conf/poldek.conf     2013-07-08 14:06:38.722878665 +0300
+@@ -132,12 +132,11 @@
  
  # Prevent package listed from being upgraded if they are already installed.
  # hold = kernel* foo*.i686 th-test:* *-smp-* th-ready:bar*.x86_64
@@ -34,3 +9,9 @@
  
  # Ignore package list - packages fits given mask will be invisible.
  # ignore = *-smp-* foo*
+-# ignore = vserver-packages
+-#ignore = vserver-packages
++ignore = vserver-packages
+ 
+ # Conflicts with already installed packages are treated as resolved
+ # if at least one of multiple-installed package satisfies conflict.