SOURCES: poldek-multilib.conf, poldek.conf - too much decorated ma...

[mis]

Author: mis                          Date: Wed Jun 27 22:27:00 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- too much decorated macros (they are local to file)

---- Files affected:
SOURCES:
   poldek-multilib.conf (1.12 -> 1.13) , poldek.conf (1.46 -> 1.47) 

---- Diffs:

================================================================
Index: SOURCES/poldek-multilib.conf
diff -u SOURCES/poldek-multilib.conf:1.12 SOURCES/poldek-multilib.conf:1.13
--- SOURCES/poldek-multilib.conf:1.12	Fri Feb  9 23:51:11 2007
+++ SOURCES/poldek-multilib.conf	Thu Jun 28 00:26:55 2007
@@ -1,51 +1,51 @@
 # Alternative multilib PLD 3.0 (Th)
-_pld_arch   = %ARCH%
-_pld_prefix = ftp://ftp.th.pld-linux.org/dists/th
+_arch   = %ARCH%
+_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
+#_prefix = ftp://ftp.task.pld-linux.org/dists/th
 
-_th_idxtype = pndir
+_type = pndir
 
 [source]
-type   = %{_th_idxtype}
-name   = th-%{_pld_arch}
-path   = %{_pld_prefix}/PLD/%{_pld_arch}/RPMS/
+type   = %{_type}
+name   = th-%{_arch}
+path   = %{_prefix}/PLD/%{_arch}/RPMS/
 auto   = no
 autoup = no
 
 [source]
-type   = %{_th_idxtype}
-name   = th-updates-security-%{_pld_arch}
-path   = %{_pld_prefix}/updates-security/%{_pld_arch}/RPMS/
+type   = %{_type}
+name   = th-updates-security-%{_arch}
+path   = %{_prefix}/updates-security/%{_arch}/RPMS/
 auto   = no
 autoup = no
 
 [source]
-type   = %{_th_idxtype}
-name   = th-updates-general-%{_pld_arch}
-path   = %{_pld_prefix}/updates-general/%{_pld_arch}/RPMS/
+type   = %{_type}
+name   = th-updates-general-%{_arch}
+path   = %{_prefix}/updates-general/%{_arch}/RPMS/
 auto   = no
 autoup = no
 
 #[source]
-#type   = %{_th_idxtype}
-#name   = th-supported-%{_pld_arch}
-#path   = %{_pld_prefix}/supported/%{_pld_arch}/
+#type   = %{_type}
+#name   = th-supported-%{_arch}
+#path   = %{_prefix}/supported/%{_arch}/
 #auto   = no
 #autoup = no
 
 [source]
-type   = %{_th_idxtype}
-name   = th-ready-%{_pld_arch}
-path   = %{_pld_prefix}/ready/%{_pld_arch}/RPMS/
+type   = %{_type}
+name   = th-ready-%{_arch}
+path   = %{_prefix}/ready/%{_arch}/RPMS/
 auto   = no
 autoup = no
 
 [source]
-type   = %{_th_idxtype}
-name   = th-test-%{_pld_arch}
-path   = %{_pld_prefix}/test/%{_pld_arch}/RPMS/
+type   = %{_type}
+name   = th-test-%{_arch}
+path   = %{_prefix}/test/%{_arch}/RPMS/
 auto   = no
 autoup = no

================================================================
Index: SOURCES/poldek.conf
diff -u SOURCES/poldek.conf:1.46 SOURCES/poldek.conf:1.47
--- SOURCES/poldek.conf:1.46	Wed May 31 21:59:24 2006
+++ SOURCES/poldek.conf	Thu Jun 28 00:26:55 2007
@@ -1,78 +1,78 @@
 # PLD Linux Distribution <http://www.pld-linux.org/>.
 
-_pld_arch   = %ARCH%
-_pld_prefix = ftp://ftp.th.pld-linux.org/dists/th
+_arch   = %ARCH%
+_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
+#_prefix = ftp://ftp.task.pld-linux.org/dists/th
 
-_th_idxtype = pndir
+_type = pndir
 
 # PLD 3.0 (Th)
 [source]
-type   = %{_th_idxtype}
+type   = %{_type}
 name   = th
-path   = %{_pld_prefix}/PLD/%{_pld_arch}/RPMS/
+path   = %{_prefix}/PLD/%{_arch}/RPMS/
 
 [source]
-type   = %{_th_idxtype}
+type   = %{_type}
 name   = th
-path   = %{_pld_prefix}/PLD/noarch/RPMS/
+path   = %{_prefix}/PLD/noarch/RPMS/
 
 [source]
-type   = %{_th_idxtype}
+type   = %{_type}
 name   = th-updates-security
-path   = %{_pld_prefix}/updates-security/%{_pld_arch}/RPMS/
+path   = %{_prefix}/updates-security/%{_arch}/RPMS/
 
 [source]
-type   = %{_th_idxtype}
+type   = %{_type}
 name   = th-updates-security
-path   = %{_pld_prefix}/updates-security/noarch/RPMS/
+path   = %{_prefix}/updates-security/noarch/RPMS/
 
 [source]
-type   = %{_th_idxtype}
+type   = %{_type}
 name   = th-updates-general
-path   = %{_pld_prefix}/updates-general/%{_pld_arch}/RPMS/
+path   = %{_prefix}/updates-general/%{_arch}/RPMS/
 auto   = no
 
 [source]
-type   = %{_th_idxtype}
+type   = %{_type}
 name   = th-updates-general
-path   = %{_pld_prefix}/updates-general/noarch/RPMS/
+path   = %{_prefix}/updates-general/noarch/RPMS/
 auto   = no
 
 #[source]
-#type   = %{_th_idxtype}
+#type   = %{_type}
 #name   = th-supported
-#path   = %{_pld_prefix}/supported/%{_pld_arch}/
+#path   = %{_prefix}/supported/%{_arch}/
 #auto   = no
 
 [source]
-type   = %{_th_idxtype}
+type   = %{_type}
 name   = th-ready
-path   = %{_pld_prefix}/ready/%{_pld_arch}/RPMS/
+path   = %{_prefix}/ready/%{_arch}/RPMS/
 auto   = no
 autoup = no
 
 [source]
-type   = %{_th_idxtype}
+type   = %{_type}
 name   = th-ready
-path   = %{_pld_prefix}/ready/noarch/RPMS/
+path   = %{_prefix}/ready/noarch/RPMS/
 auto   = no
 autoup = no
 
 [source]
-type   = %{_th_idxtype}
+type   = %{_type}
 name   = th-test
-path   = %{_pld_prefix}/test/%{_pld_arch}/RPMS/
+path   = %{_prefix}/test/%{_arch}/RPMS/
 auto   = no
 autoup = no
 
 [source]
-type   = %{_th_idxtype}
+type   = %{_type}
 name   = th-test
-path   = %{_pld_prefix}/test/noarch/RPMS/
+path   = %{_prefix}/test/noarch/RPMS/
 auto   = no
 autoup = no
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/poldek-multilib.conf?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SOURCES/poldek.conf?r1=1.46&r2=1.47&f=u