set ftp_arch on %{arm}

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

diff --git a/poldek-config.patch b/poldek-config.patch
index efeff373109fe0ed750d8df9bdfd9513e4f4eb73..f89f30478bbbc9426ea3b1530a85558880c87c5e 100644 (file)
--- a/poldek-config.patch
+++ b/poldek-config.patch
@@ -1,36 +1,17 @@
---- poldek-0.30-cvs20080225.00/conf/poldek.conf        2008-03-27 18:27:35.244886349 +0200
-+++ poldek-0.30-cvs20080225.00/conf/poldek.conf        2008-04-23 21:30:04.261046197 +0300
-@@ -3,18 +3,12 @@
- # Some macros. Macros are local, they are not visible in included files
- # and macros declared in them are not visible to includer.
- # Macros names starts with underscore '_'.
--#
--_distro  = pld
--
--# Both local and remote files may be included. Included files may not contain
--# [global] section, it will be ignored anyway. 
--%include %{_distro}-source.conf
- 
- # local sources
- %include source.conf
- 
- # /etc/poldek/repos.d/*.conf
--#%includedir repos.d
-+%includedir repos.d
- 
- # External downloaders configuration, not necessary in most cases, cause
- # to internal HTTP and FTP client.
-@@ -130,11 +124,10 @@
- #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*
+ # hold = kernel* foo*.i686 th-test:* *-smp-* th-ready:bar*.x86_64
 -#hold = 
 +hold = kernel*
  
  # 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.