Author: hawk Date: Fri Mar 28 14:34:34 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - pld-<dist>-i686 templates are back for x86_64 hosts
---- Files affected: SPECS: util-vserver.spec (1.182 -> 1.183) ---- Diffs: ================================================================ Index: SPECS/util-vserver.spec diff -u SPECS/util-vserver.spec:1.182 SPECS/util-vserver.spec:1.183 --- SPECS/util-vserver.spec:1.182 Fri Mar 28 15:02:01 2008 +++ SPECS/util-vserver.spec Fri Mar 28 15:34:29 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.2 +Release: 2.3 License: GPL Group: Applications/System Source0: http://ftp.linux-vserver.org/pub/utils/util-vserver/%{name}-%{version}.tar.bz2 @@ -513,6 +513,15 @@ %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} @@ -531,6 +540,15 @@ %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} @@ -546,6 +564,15 @@ %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 @@ -930,6 +957,20 @@ %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) @@ -961,6 +1002,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.183 2008-03-28 14:34:29 hawk +- pld-<dist>-i686 templates are back for x86_64 hosts + Revision 1.182 2008-03-28 14:02:01 hawk - s/i486/i386/ in poldeks pld.conf for ac chroots on th-i486 hosts ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/util-vserver.spec?r1=1.182&r2=1.183&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
