Author: hawk Date: Fri Mar 28 13:56:43 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - set proper arch in poldeks pld.conf for pld-ac and pld-ti (wasn't old method better?) - still non-integer release, pld-<dist>-i686 distros have vanished and must be restored
---- Files affected: SPECS: util-vserver.spec (1.180 -> 1.181) ---- Diffs: ================================================================ Index: SPECS/util-vserver.spec diff -u SPECS/util-vserver.spec:1.180 SPECS/util-vserver.spec:1.181 --- SPECS/util-vserver.spec:1.180 Fri Mar 28 14:44:34 2008 +++ SPECS/util-vserver.spec Fri Mar 28 14:56:38 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.1 +Release: 2.2 License: GPL Group: Applications/System Source0: http://ftp.linux-vserver.org/pub/utils/util-vserver/%{name}-%{version}.tar.bz2 @@ -495,6 +495,22 @@ install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys 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 +%define _ftp_arch %{_target_cpu} +%endif +%ifarch %{x8664} +%define _ftp_arch amd64 +%endif +%ifarch 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-ac/poldek/repos.d/pld.conf + +# set arch for pld-th in pld.conf %ifarch i486 i686 ppc sparc alpha athlon %define _ftp_arch %{_target_cpu} %endif @@ -510,9 +526,21 @@ %ifarch sparcv9 sparc64 %define _ftp_arch sparc %endif - -%{__sed} -i -e 's|%%ARCH%%|%{_ftp_arch}|' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac/poldek/repos.d/pld.conf %{__sed} -i -e 's|%%ARCH%%|%{_ftp_arch}|' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th/poldek/repos.d/pld.conf + +# set arch for pld-ti in pld.conf +%ifarch i486 i686 ppc sparc alpha athlon +%define _ftp_arch %{_target_cpu} +%endif +%ifarch %{x8664} +%define _ftp_arch x86_64 +%endif +%ifarch 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 cat <<'EOF' > $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/defaults/rpm/platform @@ -930,6 +958,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.181 2008-03-28 13:56:38 hawk +- set proper arch in poldeks pld.conf for pld-ac and pld-ti (wasn't old method better?) +- still non-integer release, pld-<dist>-i686 distros have vanished and must be restored + Revision 1.180 2008-03-28 13:44:34 hawk - non-integer release, _ftp_arch macro is Th specific and must be fixed ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/util-vserver.spec?r1=1.180&r2=1.181&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
