From: hawk <hawk@pld-linux.org>
Date: Fri, 28 Mar 2008 14:34:29 +0000 (+0000)
Subject: - pld-<dist>-i686 templates are back for x86_64 hosts
X-Git-Tag: auto/ac/util-vserver-0_30_214-4~5
X-Git-Url: http://git.pld-linux.org/?p=packages%2Futil-vserver.git;a=commitdiff_plain;h=8af339893ce286541d24ac5439678b65a0340281

- pld-<dist>-i686 templates are back for x86_64 hosts

Changed files:
    util-vserver.spec -> 1.183
---

diff --git a/util-vserver.spec b/util-vserver.spec
index 86ea03e..3f0c40d 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -22,7 +22,7 @@ Summary:	Linux virtual server utilities
 Summary(pl.UTF-8):	Narzędzia dla linuksowych serwerów wirtualnych
 Name:		util-vserver
 Version:	0.30.215
-Release:	2.2
+Release:	2.3
 License:	GPL
 Group:		Applications/System
 Source0:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%{name}-%{version}.tar.bz2
@@ -512,6 +512,15 @@ cp -a %{SOURCE14} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys
 %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}
@@ -530,6 +539,15 @@ cp -a %{SOURCE14} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys
 %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 i486 i686 ppc sparc alpha athlon
 %define		_ftp_arch	%{_target_cpu}
@@ -545,6 +563,15 @@ cp -a %{SOURCE14} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys
 %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
@@ -929,6 +956,20 @@ exit 0
 %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)