SPECS: util-vserver.spec - revert fake pld-XX-i686 distros, use --...

[glen]

Author: glen                         Date: Fri Mar 28 14:51:26 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- revert fake pld-XX-i686 distros, use --machine and --personality
- see http://www.pld-linux.org/Vserver for usage

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

---- Diffs:

================================================================
Index: SPECS/util-vserver.spec
diff -u SPECS/util-vserver.spec:1.184 SPECS/util-vserver.spec:1.185
--- SPECS/util-vserver.spec:1.184	Fri Mar 28 15:50:02 2008
+++ SPECS/util-vserver.spec	Fri Mar 28 15:51:20 2008
@@ -513,15 +513,6 @@
 %endif
 %{__sed} -i -e 's|%%ARCH%%|%{_ftp_arch}|' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac/poldek/repos.d/pld.conf
 
-%ifarch %{x8664}
-# ac i686 for x86_64 hosts
-cp -a $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac \
-	$RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac-i686
-cp -a $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac \
-        $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac-i686
-sed -i 's/%{_ftp_arch}/i686/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac-i686/poldek/repos.d/pld.conf
-%endif
-
 # set arch for pld-th in pld.conf
 %ifarch i486 i686 ppc sparc alpha athlon
 %define		_ftp_arch	%{_target_cpu}
@@ -540,15 +531,6 @@
 %endif
 %{__sed} -i -e 's|%%ARCH%%|%{_ftp_arch}|' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th/poldek/repos.d/pld.conf
 
-%ifarch %{x8664}
-# th i686 for x86_64 hosts
-cp -a $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th \
-	$RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th-i686
-cp -a $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th \
-        $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th-i686
-sed -i 's/%{_ftp_arch}/i686/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th-i686/poldek/repos.d/pld.conf
-%endif
-
 # set arch for pld-ti in pld.conf
 %ifarch i586 i686
 %define		_ftp_arch	%{_target_cpu}
@@ -561,15 +543,6 @@
 %endif
 %{__sed} -i -e 's|%%ARCH%%|%{_ftp_arch}|' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti/poldek/repos.d/pld.conf
 
-%ifarch %{x8664}
-# titanium i686 for x86_64 hosts
-cp -a $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti \
-	$RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti-i686
-cp -a $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti \
-        $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti-i686
-sed -i 's/%{_ftp_arch}/i686/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti-i686/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
 %{_target_cpu}-%{_target_vendor}-linux
@@ -954,20 +927,6 @@
 %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
-%ifarch %{x8664}
-%dir %{_sysconfdir}/vservers/.distributions/pld-ac-i686
-%dir %{_sysconfdir}/vservers/.distributions/pld-ac-i686/poldek
-%dir %{_sysconfdir}/vservers/.distributions/pld-ac-i686/poldek/repos.d
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-ac-i686/poldek/repos.d/*.conf
-%dir %{_sysconfdir}/vservers/.distributions/pld-th-i686
-%dir %{_sysconfdir}/vservers/.distributions/pld-th-i686/poldek
-%dir %{_sysconfdir}/vservers/.distributions/pld-th-i686/poldek/repos.d
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-th-i686/poldek/repos.d/*.conf
-%dir %{_sysconfdir}/vservers/.distributions/pld-ti-i686
-%dir %{_sysconfdir}/vservers/.distributions/pld-ti-i686/poldek
-%dir %{_sysconfdir}/vservers/.distributions/pld-ti-i686/poldek/repos.d
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-ti-i686/poldek/repos.d/*.conf
-%endif
 
 %files -n vserver-distro-redhat
 %defattr(644,root,root,755)
@@ -999,6 +958,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
+
 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
================================================================

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