- let's make AIDA alive

Changed files:
    poldek-aidath.conf -> 1.1
    poldek-multilib-aidath.conf -> 1.1
    poldek.spec -> 1.385

diff --git a/poldek-aidath.conf b/poldek-aidath.conf
new file mode 100644 (file)
index 0000000..eb261ee
--- /dev/null
+++ b/poldek-aidath.conf
@@ -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

diff --git a/poldek-multilib-aidath.conf b/poldek-multilib-aidath.conf
new file mode 100644 (file)
index 0000000..7820779
--- /dev/null
+++ b/poldek-multilib-aidath.conf
@@ -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

diff --git a/poldek.spec b/poldek.spec
index e8d8284109be0e243046c782187adbbd09f04a48..5de4ee9b7bba87e70324f0779becff98c539b4ad 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -34,6 +34,8 @@ Source5:      %{name}-aliases.conf
 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
@@ -262,6 +264,12 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d
 %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}
@@ -278,6 +286,18 @@ sed '
 %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
@@ -291,6 +311,7 @@ sed '
 ' < %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
 %endif
 %endif
+%endif
 
 install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cli.conf