SOURCES: poldek.conf, poldek-multilib.conf - keep multilib config ...

[glen]

Author: glen                         Date: Wed May 31 19:59:30 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- keep multilib config in separate sourcefile

---- Files affected:
SOURCES:
   poldek.conf (1.45 -> 1.46) , poldek-multilib.conf (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SOURCES/poldek.conf
diff -u SOURCES/poldek.conf:1.45 SOURCES/poldek.conf:1.46
--- SOURCES/poldek.conf:1.45	Thu May 25 14:11:13 2006
+++ SOURCES/poldek.conf	Wed May 31 21:59:24 2006
@@ -1,7 +1,6 @@
-# PLD <http://www.pld-linux.org/>
+# PLD Linux Distribution <http://www.pld-linux.org/>.
 
 _pld_arch   = %ARCH%
-_pld_alt_arch = %ALT_ARCH%
 _pld_prefix = ftp://ftp.th.pld-linux.org/dists/th
 ## Some mirrors
 ## You can use them if you have better connection there

================================================================
Index: SOURCES/poldek-multilib.conf
diff -u SOURCES/poldek-multilib.conf:1.9 SOURCES/poldek-multilib.conf:1.10
--- SOURCES/poldek-multilib.conf:1.9	Thu May 25 14:12:58 2006
+++ SOURCES/poldek-multilib.conf	Wed May 31 21:59:24 2006
@@ -1,42 +1,51 @@
 # Alternative multilib PLD 3.0 (Th)
+_pld_arch   = %ARCH%
+_pld_prefix = ftp://ftp.th.pld-linux.org/dists/th
+## Some mirrors
+## You can use them if you have better connection there
+# CI TASK:
+#_pld_prefix = ftp://ftp.task.pld-linux.org/dists/th
+
+_th_idxtype = pndir
+
 [source]
 type   = %{_th_idxtype}
-name   = th-%{_pld_alt_arch}
-path   = %{_pld_prefix}/PLD/%{_pld_alt_arch}/PLD/RPMS/
+name   = th-%{_pld_arch}
+path   = %{_pld_prefix}/PLD/%{_pld_arch}/PLD/RPMS/
 auto   = no
 autoup = no
 
 [source]
 type   = %{_th_idxtype}
-name   = th-updates-security-%{_pld_alt_arch}
-path   = %{_pld_prefix}/updates/security/%{_pld_alt_arch}/
+name   = th-updates-security-%{_pld_arch}
+path   = %{_pld_prefix}/updates/security/%{_pld_arch}/
 auto   = no
 autoup = no
 
 [source]
 type   = %{_th_idxtype}
-name   = th-updates-general-%{_pld_alt_arch}
-path   = %{_pld_prefix}/updates/general/%{_pld_alt_arch}/
+name   = th-updates-general-%{_pld_arch}
+path   = %{_pld_prefix}/updates/general/%{_pld_arch}/
 auto   = no
 autoup = no
 
 [source]
 type   = %{_th_idxtype}
-name   = th-supported-%{_pld_alt_arch}
-path   = %{_pld_prefix}/supported/%{_pld_alt_arch}/
+name   = th-supported-%{_pld_arch}
+path   = %{_pld_prefix}/supported/%{_pld_arch}/
 auto   = no
 autoup = no
 
 [source]
 type   = %{_th_idxtype}
-name   = th-ready-%{_pld_alt_arch}
-path   = %{_pld_prefix}/ready/%{_pld_alt_arch}/
+name   = th-ready-%{_pld_arch}
+path   = %{_pld_prefix}/ready/%{_pld_arch}/
 auto   = no
 autoup = no
 
 [source]
 type   = %{_th_idxtype}
-name   = th-test-%{_pld_alt_arch}
-path   = %{_pld_prefix}/test/%{_pld_alt_arch}/
+name   = th-test-%{_pld_arch}
+path   = %{_pld_prefix}/test/%{_pld_arch}/
 auto   = no
 autoup = no
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/poldek.conf?r1=1.45&r2=1.46&f=u
    http://cvs.pld-linux.org/SOURCES/poldek-multilib.conf?r1=1.9&r2=1.10&f=u