- update ac repos config from poldek-0:0.30-0.20080820.23.22.i686

Changed files:
    util-vserver-pld.patch -> 1.42

diff --git a/util-vserver-pld.patch b/util-vserver-pld.patch
index 1449eeeb9c264cc2b4ddac6236a88a1e82124ba4..9adacbc38744fed93b58af9526a091232e6ddfff 100644 (file)
--- a/util-vserver-pld.patch
+++ b/util-vserver-pld.patch
@@ -57,9 +57,11 @@
 +vserver-packages
 --- util-vserver-0.30.216-r2837.orig/distrib/pld-ac/poldek/repos.d/pld.conf    1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.216-r2837/distrib/pld-ac/poldek/repos.d/pld.conf 2009-06-22 17:48:26.000000000 +0200
-@@ -0,0 +1,56 @@
+@@ -0,0 +1,64 @@
 +# $Id$
 +# PLD Linux Distribution <http://www.pld-linux.org/>.
++#
++# Main sources for PLD Linux 2.0 (Ac)
 +
 +# specify our packages architecture
 +_arch   = %ARCH%
@@ -71,20 +73,19 @@
 +## You can use them if you have better connection there
 +# CI TASK:
 +#_prefix = ftp://ftp.task.pld-linux.org/dists/ac
-+#_prefix = %{_pld_main_prefix}
 +_prefix = %{_pld_main_prefix}
 +
 +_type = pndir
 +
-+# PLD 2.0 (Ac)
++# PLD Linux 2.0 (Ac)
 +[source]
 +type   = %{_type}
-+name   = ac
++name   = ac-main
 +path   = %{_prefix}/PLD/%{_arch}/PLD/RPMS/
 +signed = yes
-+# buggy deps -- use one from updates instead
-+ignore = msmtp-sendmail*
 +pri    = 1
++# msmtp-sendmail is broken, yum noarch is older than in updates
++ignore = msmtp-sendmail* yum*
 +
 +[source]
 +type   = %{_type}
@@ -97,14 +98,15 @@
 +type   = %{_type}
 +name   = ac-supported
 +path   = %{_prefix}/supported/%{_arch}/
++signed = yes
 +auto   = no
 +autoup = no
-+signed = yes
 +
 +[source]
 +type   = %{_type}
 +name   = ac-ready
 +path   = %{_pld_main_prefix}/ready/%{_arch}/
++#signed = yes
 +auto   = no
 +autoup = no
 +
@@ -114,6 +116,12 @@
 +path   = %{_pld_main_prefix}/test/%{_arch}/
 +auto   = no
 +autoup = no
++
++# ac-main + ac-updates
++[source]
++type   = group
++name   = ac
++sources = ac-main ac-updates
 --- util-vserver-0.30.216-r2837.orig/distrib/pld-ac/rpm/macros 1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.216-r2837/distrib/pld-ac/rpm/macros      2009-06-22 17:48:26.000000000 +0200
 @@ -0,0 +1,6 @@