From 8db66c11aeeb25da13e0759df819c41055fb7674 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 30 Aug 2010 11:08:22 +0000 Subject: [PATCH] - add pld-archive.conf for th; rel 4 Changed files: poldek-archive.conf -> 1.1 poldek.spec -> 1.413 --- poldek-archive.conf | 30 ++++++++++++++++++++++++++++++ poldek.spec | 9 ++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 poldek-archive.conf diff --git a/poldek-archive.conf b/poldek-archive.conf new file mode 100644 index 0000000..1467b8b --- /dev/null +++ b/poldek-archive.conf @@ -0,0 +1,30 @@ +# PLD Linux Distribution . +# +# 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 diff --git a/poldek.spec b/poldek.spec index 82f2771..1ea93c3 100644 --- a/poldek.spec +++ b/poldek.spec @@ -17,7 +17,7 @@ %define ver_rpm 4.5-5 %define snap rc1 -%define rel 3 +%define rel 4 Summary: RPM packages management helper tool Summary(hu.UTF-8): RPM csomagkezelést segítő eszköz Summary(pl.UTF-8): Pomocnicze narzędzie do zarządzania pakietami RPM @@ -39,6 +39,7 @@ Source7: %{name}.png Source8: %{name}-debuginfo.conf Source9: %{name}-aidath.conf Source10: %{name}-multilib-aidath.conf +Source11: %{name}-archive.conf Patch0: %{name}-vserver-packages.patch Patch1: %{name}-config.patch Patch2: %{name}-size-type.patch @@ -279,6 +280,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d %if "%{pld_release}" == "th" %define pld_conf %{SOURCE1} %define pld_debuginfo_conf %{SOURCE8} + %define pld_archive_conf %{SOURCE11} %ifarch %{x8664} %define pld_multilib_conf %{SOURCE2} @@ -287,6 +289,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d # aidath %ifarch sparcv9 sparc64 %define pld_conf %{SOURCE9} + %undefine pld_archive_conf %endif %ifarch sparc64 %define pld_multilib_conf %{SOURCE10} @@ -303,6 +306,10 @@ sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{pld_conf} > $RPM_BUILD_ROOT%{_sysconfdir} sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{pld_debuginfo_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-debuginfo.conf %endif +%if 0%{?pld_archive_conf:1} +sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{pld_archive_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-archive.conf +%endif + cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cli.conf %if %{with imode} -- 2.44.0