packages: poldek/poldek.spec, poldek/poldek-archive.conf (NEW)=?UTF-8?Q?=20?=- reformat s...

[glen]

Author: glen                         Date: Mon Aug 30 10:55:45 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- reformat sources hacking to get some readability

---- Files affected:
packages/poldek:
   poldek.spec (1.410 -> 1.411) , poldek-archive.conf (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/poldek/poldek.spec
diff -u packages/poldek/poldek.spec:1.410 packages/poldek/poldek.spec:1.411
--- packages/poldek/poldek.spec:1.410	Sun Aug 22 21:43:45 2010
+++ packages/poldek/poldek.spec	Mon Aug 30 12:55:39 2010
@@ -244,80 +244,65 @@
 %{?with_static:rm -f $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
 
 %ifarch i486 i686 ppc sparc alpha athlon
-%define		_ftp_arch	%{_target_cpu}
+	%define		_ftp_arch	%{_target_cpu}
 %endif
 %ifarch %{x8664}
-%define		_ftp_arch	x86_64
-%define		_ftp_alt_arch	i686
+	%define		_ftp_arch	x86_64
+	%define		_ftp_alt_arch	i686
 %endif
 %ifarch i586
-%if "%{pld_release}" == "ti"
-%define		_ftp_arch	i586
-%else
-%define		_ftp_arch	i486
-%endif
+	%if "%{pld_release}" == "ti"
+		%define		_ftp_arch	i586
+	%else
+		%define		_ftp_arch	i486
+	%endif
 %endif
 %ifarch pentium2 pentium3 pentium4
-%define		_ftp_arch	i686
+	%define		_ftp_arch	i686
 %endif
 %ifarch sparcv9 sparc64
-%define		_ftp_arch	sparc
-%if "%{pld_release}" == "th"
-%define		_ftp_arch	%{_target_cpu}
-%ifarch sparc64
-%define		_ftp_alt_arch	sparcv9
-%endif
+	%define		_ftp_arch	sparc
+	%if "%{pld_release}" == "th"
+		%define		_ftp_arch	%{_target_cpu}
+		%ifarch sparc64
+		%define		_ftp_alt_arch	sparcv9
+		%endif
+	%endif
 %endif
-%endif
-
-%{?with_static:rm -f $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
 
 %if "%{pld_release}" == "ti"
-sed -e '
-	s|%%ARCH%%|%{_ftp_arch}|g
-' < %{SOURCE3} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
-
-%ifarch %{x8664}
-sed '
-	s|%%ARCH%%|%{_ftp_alt_arch}|g
-' < %{SOURCE4} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
-%endif
-%else
-# pld_release = th
-%ifarch sparcv9 sparc64
-sed -e '
-	s|%%ARCH%%|%{_ftp_arch}|g
-' < %{SOURCE9} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
-
-%ifarch sparc64
-sed '
-	s|%%ARCH%%|%{_ftp_alt_arch}|g
-' < %{SOURCE10} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
-%endif
-
-%else
-sed -e '
-	s|%%ARCH%%|%{_ftp_arch}|g
-' < %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
-sed -e '
-	s|%%ARCH%%|%{_ftp_arch}|g
-' < %{SOURCE8} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-debuginfo.conf
+	sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{SOURCE3} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
 
-%ifarch %{x8664}
-sed '
-	s|%%ARCH%%|%{_ftp_alt_arch}|g
-' < %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
-%endif
+	%ifarch %{x8664}
+		sed 's|%%ARCH%%|%{_ftp_alt_arch}|g' < %{SOURCE4} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
+	%endif
 %endif
+%if "%{pld_release}" == "th"
+	# aidath
+	%ifarch sparcv9 sparc64
+		sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{SOURCE9} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
+
+		%ifarch sparc64
+		sed 's|%%ARCH%%|%{_ftp_alt_arch}|g' < %{SOURCE10} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
+		%endif
+	%else
+		# th
+		sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
+		sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{SOURCE8} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-debuginfo.conf
+
+		%ifarch %{x8664}
+			sed 's|%%ARCH%%|%{_ftp_alt_arch}|g' < %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
+		%endif
+	%endif
 %endif
 
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cli.conf
+cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cli.conf
 
 %if %{with imode}
 # add desktop file and icon
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
-install %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
-install %{SOURCE7} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 %endif
 
 # sources we don't package
@@ -487,6 +472,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.411  2010/08/30 10:55:39  glen
+- reformat sources hacking to get some readability
+
 Revision 1.410  2010/08/22 19:43:45  glen
 - release 3
 

================================================================
Index: packages/poldek/poldek-archive.conf
diff -u /dev/null packages/poldek/poldek-archive.conf:1.1
--- /dev/null	Mon Aug 30 12:55:45 2010
+++ packages/poldek/poldek-archive.conf	Mon Aug 30 12:55:39 2010
@@ -0,0 +1,30 @@
+# PLD Linux Distribution <http://www.pld-linux.org/>.
+#
+# Main sources for PLD Linux 3.0 (Th)
+
+# specify our packages architecture
+_arch   = x86_64
+
+# main PLD-site for often changed things (test, ready):
+_pld_main_prefix = http://ftp1.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}
+
+# PLD Linux 3.0 (Th): main sources archive
+[source]
+type   = pndir
+name   = th-archive
+path   = %{_prefix}/.archive/PLD/%{_arch}/RPMS/
+auto   = no
+autoup = no
+
+[source]
+type   = pndir
+name   = th-archive
+path   = %{_prefix}/.archive/PLD/noarch/RPMS/
+auto   = no
+autoup = no
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/poldek/poldek.spec?r1=1.410&r2=1.411&f=u