- introduce _pld_main_prefix/_pld_main_prefix like ac; rel 28

Changed files:
    poldek-multilib.conf -> 1.19
    poldek.conf -> 1.54
    poldek.spec -> 1.381

diff --git a/poldek-multilib.conf b/poldek-multilib.conf
index 0fb39a35c60b5dd950ab4b10b53d368be62bf9a8..53c1b8af194b71e62bcd33e747f549c2dcc6e07d 100644 (file)
--- a/poldek-multilib.conf
+++ b/poldek-multilib.conf
@@ -1,36 +1,40 @@
-# Alternative multilib PLD 3.0 (Th)
+# $Id$
+# PLD Linux Distribution <http://www.pld-linux.org/>.
+#
+# Alternative multilib sources for PLD Linux 3.0 (Th)
+
 _arch   = %ARCH%
-_prefix = ftp://ftp.th.pld-linux.org/dists/th
+_pld_main_prefix = ftp://ftp.th.pld-linux.org/dists/th
+
 ## Some mirrors
 ## You can use them if you have better connection there
 # CI TASK:
 #_prefix = ftp://ftp.task.pld-linux.org/dists/th
-
-_type = pndir
+_prefix = %{_pld_main_prefix}
 
 [source]
-type   = %{_type}
+type   = pndir
 name   = th-%{_arch}
 path   = %{_prefix}/PLD/%{_arch}/RPMS/
 auto   = no
 autoup = no
 
-#[source]
-#type   = %{_type}
-#name   = th-%{_arch}-updates
-#path   = %{_prefix}/updates/%{_arch}/RPMS/
-#auto   = no
-#autoup = no
+[source]
+type   = pndir
+name   = th-%{_arch}-obsolete
+path   = %{_prefix}/obsolete/%{_arch}/RPMS/
+auto   = no
+autoup = no
 
 [source]
-type   = %{_type}
+type   = pndir
 name   = th-%{_arch}-ready
 path   = %{_prefix}/ready/%{_arch}/RPMS/
 auto   = no
 autoup = no
 
 [source]
-type   = %{_type}
+type   = pndir
 name   = th-%{_arch}-test
 path   = %{_prefix}/test/%{_arch}/RPMS/
 auto   = no

diff --git a/poldek.conf b/poldek.conf
index 53caf0678a148ba2992388b6ba8b81d4283559f5..bcdd85fb2d165e016640b762ad0bf54e970cee44 100644 (file)
--- a/poldek.conf
+++ b/poldek.conf
@@ -1,62 +1,70 @@
 # PLD Linux Distribution <http://www.pld-linux.org/>.
+#
+# Main sources for PLD Linux 3.0 (Th)
 
+# specify our packages architecture
 _arch   = %ARCH%
-_prefix = ftp://ftp.th.pld-linux.org/dists/th
+
+# main PLD-site for often changed things (test, ready):
+_pld_main_prefix = ftp://ftp.th.pld-linux.org/dists/th
+
 ## Some mirrors
 ## You can use them if you have better connection there
 # CI TASK:
 #_prefix = ftp://ftp.task.pld-linux.org/dists/th
+_prefix = %{_pld_main_prefix}
 
-_type = pndir
-
-# PLD 3.0 (Th)
+# PLD Linux 3.0 (Th): main sources
 [source]
-type   = %{_type}
+type   = pndir
 name   = th
 path   = %{_prefix}/PLD/%{_arch}/RPMS/
 
 [source]
-type   = %{_type}
+type   = pndir
 name   = th
 path   = %{_prefix}/PLD/noarch/RPMS/
 
+# PLD Linux 3.0 (Th): obsolete sources (kde3, ...)
 [source]
-type   = %{_type}
+type   = pndir
 name   = th-obsolete
 path   = %{_prefix}/obsolete/%{_arch}/RPMS/
 auto   = no
 autoup = no
 
 [source]
-type   = %{_type}
+type   = pndir
 name   = th-obsolete
 path   = %{_prefix}/obsolete/noarch/RPMS/
 auto   = no
 autoup = no
 
+# PLD Linux 3.0 (Th): ready sources (testing stage before moved to main)
 [source]
-type   = %{_type}
+type   = pndir
 name   = th-ready
 path   = %{_prefix}/ready/%{_arch}/RPMS/
 auto   = no
 autoup = no
 
 [source]
-type   = %{_type}
+type   = pndir
 name   = th-ready
 path   = %{_prefix}/ready/noarch/RPMS/
 auto   = no
 autoup = no
 
+# PLD Linux 3.0 (Th): test sources (built packages to be moved to ready)
 [source]
-type   = %{_type}
+type   = pndir
 name   = th-test
 path   = %{_prefix}/test/%{_arch}/RPMS/
 auto   = no
 autoup = no
 
 [source]
-type   = %{_type}
+type   = pndir
 name   = th-test
 path   = %{_prefix}/test/noarch/RPMS/
 auto   = no

diff --git a/poldek.spec b/poldek.spec
index 9b84bbe1c5489eff7a2e0e3bb13268cd671bf4f9..4462d85089c585d636c5a68b7d4ed73d597f6532 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -15,7 +15,7 @@
 %define        ver_rpm 4.5-5
 #
 %define                snap    20080820.23
-%define                rel             27
+%define                rel             28
 Summary:       RPM packages management helper tool
 Summary(pl.UTF-8):     Pomocnicze narzędzie do zarządzania pakietami RPM
 Name:          poldek