packages: poldek/poldek.spec, poldek/poldek-aidath.conf (NEW), poldek/polde...
tommat
tommat at pld-linux.org
Tue Jun 23 00:59:34 CEST 2009
Author: tommat Date: Mon Jun 22 22:59:34 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- let's make AIDA alive
---- Files affected:
packages/poldek:
poldek.spec (1.384 -> 1.385) , poldek-aidath.conf (NONE -> 1.1) (NEW), poldek-multilib-aidath.conf (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/poldek/poldek.spec
diff -u packages/poldek/poldek.spec:1.384 packages/poldek/poldek.spec:1.385
--- packages/poldek/poldek.spec:1.384 Sat May 30 12:36:25 2009
+++ packages/poldek/poldek.spec Tue Jun 23 00:59:28 2009
@@ -35,6 +35,8 @@
Source6: %{name}.desktop
Source7: %{name}.png
Source8: %{name}-debuginfo.conf
+Source9: %{name}-aidath.conf
+Source10: %{name}-multilib-aidath.conf
Patch0: %{name}-vserver-packages.patch
Patch1: %{name}-config.patch
Patch2: %{name}-abort-on-upgrade.patch
@@ -263,6 +265,12 @@
%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
+%endif
%endif
%{?with_static:rm -f $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
@@ -279,6 +287,18 @@
%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
@@ -292,6 +312,7 @@
' < %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
%endif
%endif
+%endif
install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cli.conf
@@ -469,6 +490,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.385 2009/06/22 22:59:28 tommat
+- let's make AIDA alive
+
Revision 1.384 2009/05/30 10:36:25 megabajt
- added -unescape-urlencoded-strings.patch (fixes lp#381548)
- release 30
================================================================
Index: packages/poldek/poldek-aidath.conf
diff -u /dev/null packages/poldek/poldek-aidath.conf:1.1
--- /dev/null Tue Jun 23 00:59:34 2009
+++ packages/poldek/poldek-aidath.conf Tue Jun 23 00:59:29 2009
@@ -0,0 +1,56 @@
+# PLD Linux Distribution <http://www.pld-linux.org/>.
+#
+# Main sources for PLD Linux 3.0 (Th)
+
+# specify our packages architecture
+_arch = %ARCH%
+
+# main PLD-site for often changed things (test, ready):
+_pld_main_prefix = ftp://ftp.th.pld-linux.org/dists/th/AIDA
+
+## Some mirrors
+## You can use them if you have better connection there
+# CI TASK:
+#_prefix = ftp://ftp.task.pld-linux.org/dists/th/AIDA
+_prefix = %{_pld_main_prefix}
+
+# PLD Linux 3.0 (Th): main sources
+[source]
+type = pndir
+name = th
+path = %{_prefix}/PLD/%{_arch}/RPMS/
+
+[source]
+type = pndir
+name = th
+path = %{_prefix}/PLD/noarch/RPMS/
+
+# PLD Linux 3.0 (Th): ready sources (testing stage before moved to main)
+[source]
+type = pndir
+name = th-ready
+path = %{_pld_main_prefix}/ready/%{_arch}/RPMS/
+auto = no
+autoup = no
+
+[source]
+type = pndir
+name = th-ready
+path = %{_pld_main_prefix}/ready/noarch/RPMS/
+auto = no
+autoup = no
+
+# PLD Linux 3.0 (Th): test sources (built packages to be moved to ready)
+[source]
+type = pndir
+name = th-test
+path = %{_pld_main_prefix}/test/%{_arch}/RPMS/
+auto = no
+autoup = no
+
+[source]
+type = pndir
+name = th-test
+path = %{_pld_main_prefix}/test/noarch/RPMS/
+auto = no
+autoup = no
================================================================
Index: packages/poldek/poldek-multilib-aidath.conf
diff -u /dev/null packages/poldek/poldek-multilib-aidath.conf:1.1
--- /dev/null Tue Jun 23 00:59:34 2009
+++ packages/poldek/poldek-multilib-aidath.conf Tue Jun 23 00:59:29 2009
@@ -0,0 +1,34 @@
+# $Id$
+# PLD Linux Distribution <http://www.pld-linux.org/>.
+#
+# Alternative multilib sources for PLD Linux 3.0 (Th)
+
+_arch = %ARCH%
+_pld_main_prefix = ftp://ftp.th.pld-linux.org/dists/th/AIDA
+
+## Some mirrors
+## You can use them if you have better connection there
+# CI TASK:
+#_prefix = ftp://ftp.task.pld-linux.org/dists/th/AIDA
+_prefix = %{_pld_main_prefix}
+
+[source]
+type = pndir
+name = th-%{_arch}
+path = %{_prefix}/PLD/%{_arch}/RPMS/
+auto = no
+autoup = no
+
+[source]
+type = pndir
+name = th-%{_arch}-ready
+path = %{_pld_main_prefix}/ready/%{_arch}/RPMS/
+auto = no
+autoup = no
+
+[source]
+type = pndir
+name = th-%{_arch}-test
+path = %{_pld_main_prefix}/test/%{_arch}/RPMS/
+auto = no
+autoup = no
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/poldek/poldek.spec?r1=1.384&r2=1.385&f=u
More information about the pld-cvs-commit
mailing list