SPECS: util-vserver.spec - more _ftp_arch fixes, we should catch a...

[hawk]

Author: hawk                         Date: Fri Mar 28 14:50:07 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- more _ftp_arch fixes, we should catch as many possibilities as possible,
  ie. th vserver on ac host, ac vserver on th-i486 host and much much more

---- Files affected:
SPECS:
   util-vserver.spec (1.183 -> 1.184) 

---- Diffs:

================================================================
Index: SPECS/util-vserver.spec
diff -u SPECS/util-vserver.spec:1.183 SPECS/util-vserver.spec:1.184
--- SPECS/util-vserver.spec:1.183	Fri Mar 28 15:34:29 2008
+++ SPECS/util-vserver.spec	Fri Mar 28 15:50:02 2008
@@ -23,7 +23,7 @@
 Summary(pl.UTF-8):	Narzędzia dla linuksowych serwerów wirtualnych
 Name:		util-vserver
 Version:	0.30.215
-Release:	2.3
+Release:	2.4
 License:	GPL
 Group:		Applications/System
 Source0:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%{name}-%{version}.tar.bz2
@@ -496,18 +496,18 @@
 cp -a %{SOURCE14} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys/pld-th.asc
 
 # set arch for pld-ac in pld.conf
-%ifarch i486 i686 ppc sparc alpha athlon
+%ifarch i586 i686 ppc sparc alpha athlon
 %define		_ftp_arch	%{_target_cpu}
 %endif
 %ifarch %{x8664}
 %define		_ftp_arch	amd64
 %endif
-%ifarch pentium2 pentium3 pentium4
-%define		_ftp_arch	i686
-%endif
 %ifarch i486
 %define		_ftp_arch	i386
 %endif
+%ifarch pentium2 pentium3 pentium4
+%define		_ftp_arch	i686
+%endif
 %ifarch sparcv9 sparc64
 %define		_ftp_arch	sparc
 %endif
@@ -550,18 +550,15 @@
 %endif
 
 # set arch for pld-ti in pld.conf
-%ifarch i486 i686 ppc sparc alpha athlon
+%ifarch i586 i686
 %define		_ftp_arch	%{_target_cpu}
 %endif
 %ifarch %{x8664}
 %define		_ftp_arch	x86_64
 %endif
-%ifarch pentium2 pentium3 pentium4
+%ifarch athlon pentium2 pentium3 pentium4
 %define		_ftp_arch	i686
 %endif
-%ifarch sparcv9 sparc64
-%define		_ftp_arch	sparc
-%endif
 %{__sed} -i -e 's|%%ARCH%%|%{_ftp_arch}|' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti/poldek/repos.d/pld.conf
 
 %ifarch %{x8664}
@@ -1002,6 +999,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.184  2008-03-28 14:50:02  hawk
+- more _ftp_arch fixes, we should catch as many possibilities as possible,
+  ie. th vserver on ac host, ac vserver on th-i486 host and much much more
+
 Revision 1.183  2008-03-28 14:34:29  hawk
 - pld-<dist>-i686 templates are back for x86_64 hosts
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/util-vserver.spec?r1=1.183&r2=1.184&f=u