SPECS: util-vserver.spec - include pld-ti template only on archite...

[hawk]

Author: hawk                         Date: Fri Mar 28 15:06:00 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- include pld-ti template only on architectures supported by PLD Titanium

---- Files affected:
SPECS:
   util-vserver.spec (1.185 -> 1.186) 

---- Diffs:

================================================================
Index: SPECS/util-vserver.spec
diff -u SPECS/util-vserver.spec:1.185 SPECS/util-vserver.spec:1.186
--- SPECS/util-vserver.spec:1.185	Fri Mar 28 15:51:20 2008
+++ SPECS/util-vserver.spec	Fri Mar 28 16:05:54 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.4
+Release:	2.5
 License:	GPL
 Group:		Applications/System
 Source0:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%{name}-%{version}.tar.bz2
@@ -481,7 +481,9 @@
 install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld/initpost
 ln -s ../pld/initpost $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/initpost
 ln -s ../pld/initpost $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/initpost
+%ifarch i586 i686 %{x8664} athlon pentium2 pentium3 pentium4
 ln -s ../pld/initpost $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti/initpost
+%endif
 install vproc-%{_vproc_version}/vproc $RPM_BUILD_ROOT%{_sbindir}
 install %{SOURCE12} $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron
 
@@ -531,6 +533,7 @@
 %endif
 %{__sed} -i -e 's|%%ARCH%%|%{_ftp_arch}|' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th/poldek/repos.d/pld.conf
 
+%ifarch i586 i686 %{x8664} athlon pentium2 pentium3 pentium4
 # set arch for pld-ti in pld.conf
 %ifarch i586 i686
 %define		_ftp_arch	%{_target_cpu}
@@ -542,6 +545,7 @@
 %define		_ftp_arch	i686
 %endif
 %{__sed} -i -e 's|%%ARCH%%|%{_ftp_arch}|' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti/poldek/repos.d/pld.conf
+%endif
 
 cat <<'EOF' > $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/defaults/rpm/platform
 # first platform file entry can't contain regexps
@@ -923,10 +927,12 @@
 %dir %{_sysconfdir}/vservers/.distributions/pld-th/poldek
 %dir %{_sysconfdir}/vservers/.distributions/pld-th/poldek/repos.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-th/poldek/repos.d/*.conf
+%ifarch i586 i686 %{x8664} athlon pentium2 pentium3 pentium4
 %dir %{_sysconfdir}/vservers/.distributions/pld-ti
 %dir %{_sysconfdir}/vservers/.distributions/pld-ti/poldek
 %dir %{_sysconfdir}/vservers/.distributions/pld-ti/poldek/repos.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-ti/poldek/repos.d/*.conf
+%endif
 
 %files -n vserver-distro-redhat
 %defattr(644,root,root,755)
@@ -958,6 +964,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.186  2008-03-28 15:05:54  hawk
+- include pld-ti template only on architectures supported by PLD Titanium
+
 Revision 1.185  2008-03-28 14:51:20  glen
 - revert fake pld-XX-i686 distros, use --machine and --personality
 - see http://www.pld-linux.org/Vserver for usage
================================================================

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