SPECS: yum.spec - put fixed arch value into repo config for Titanium at bui...
hawk
hawk at pld-linux.org
Thu Mar 19 13:31:02 CET 2009
Author: hawk Date: Thu Mar 19 12:31:02 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- put fixed arch value into repo config for Titanium at build time
(same way as in poldek.spec), Th left unchanged
---- Files affected:
SPECS:
yum.spec (1.71 -> 1.72)
---- Diffs:
================================================================
Index: SPECS/yum.spec
diff -u SPECS/yum.spec:1.71 SPECS/yum.spec:1.72
--- SPECS/yum.spec:1.71 Thu Mar 19 12:39:18 2009
+++ SPECS/yum.spec Thu Mar 19 13:30:56 2009
@@ -76,8 +76,30 @@
DESTDIR=$RPM_BUILD_ROOT \
PYLIBDIR=%{py_sitescriptdir}/..
+%ifarch i486 i686 ppc sparc alpha athlon
+%define _ftp_arch %{_target_cpu}
+%endif
+%ifarch %{x8664}
+%define _ftp_arch x86_64
+%endif
+%ifarch i586
+%if "%{pld_release}" == "ti"
+%define _ftp_arch i586
+%else
+%define _ftp_arch i486
+%endif
+%endif
+%ifarch pentium2 pentium3 pentium4
+%define _ftp_arch i686
+%endif
+%ifarch sparcv9 sparc64
+%define _ftp_arch sparc
+%endif
+
%if "%{pld_release}" == "ti"
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/yum/repos.d/pld.repo
+sed -e '
+ s|%%ARCH%%|%{_ftp_arch}|g
+ ' < %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/yum/repos.d/pld.repo
%else
install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/yum/repos.d/pld.repo
%endif
@@ -154,6 +176,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.72 2009/03/19 12:30:56 hawk
+- put fixed arch value into repo config for Titanium at build time
+ (same way as in poldek.spec), Th left unchanged
+
Revision 1.71 2009/03/19 11:39:18 hawk
- repo config for Titanium
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/yum.spec?r1=1.71&r2=1.72&f=u
More information about the pld-cvs-commit
mailing list