Author: glen Date: Tue Mar 25 22:06:32 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- resolve duplicate files
- subst default ftp arch for pld-ac
- ac.asc moved to libdir
---- Files affected:
SPECS:
util-vserver.spec (1.138.2.29 -> 1.138.2.30)
---- Diffs:
================================================================
Index: SPECS/util-vserver.spec
diff -u SPECS/util-vserver.spec:1.138.2.29 SPECS/util-vserver.spec:1.138.2.30
--- SPECS/util-vserver.spec:1.138.2.29 Tue Mar 25 22:43:22 2008
+++ SPECS/util-vserver.spec Tue Mar 25 23:06:27 2008
@@ -2,12 +2,9 @@
# TODO
# - somewhy empty /var/cache/vservers is needed when building pld vserver
# - make build create /dev/std{in,out,err} links
-# - reject install in %pre if /proc/virtual/info has incompatible version
+# - reject install in %%pretrans if /proc/virtual/info has incompatible version
# - unpackaged
# /etc/rc.d/init.d/util-vserver -- # integrate to our initscript
(util-vserver sets the path to vshelper and kills all guest processes)
-# - duplicate: # rpm -qf /usr/lib64/util-vserver/vserver-setup.functions
-# util-vserver-0.30.214-1.3.amd64
-# util-vserver-build-0.30.214-1.3.amd64
#
# m68k and mips are the only not supported archs
#
@@ -25,7 +22,7 @@
Summary(pl.UTF-8): Narzędzia dla linuksowych serwerów wirtualnych
Name: util-vserver
Version: 0.30.214
-Release: 1.8
+Release: 1.13
License: GPL
Group: Applications/System
Source0:
http://ftp.linux-vserver.org/pub/utils/util-vserver/%{name}-%{version}.tar.bz2
@@ -468,8 +465,30 @@
02 2 * * 0 root %{_libdir}/%{name}/vhashify.cron
EOF
-install -d
$RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac/poldek/pubkeys
-cp -a %{SOURCE13}
$RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac/poldek/pubkeys/pld-ac.asc
+install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/pubkeys
+cp -a %{SOURCE13}
$RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/pubkeys/pld-ac.asc
+
+%ifarch i386 i586 i686 ppc sparc alpha athlon
+%define _ftp_arch %{_target_cpu}
+%else
+%ifarch %{x8664}
+%define _ftp_arch amd64
+%define _ftp_alt_arch i686
+%else
+%ifarch i486
+%define _ftp_arch i386
+%else
+%ifarch pentium2 pentium3 pentium4
+%define _ftp_arch i686
+%else
+%ifarch sparcv9 sparc64
+%define _ftp_arch sparc
+%endif
+%endif
+%endif
+%endif
+
+sed -i -e 's|%%ARCH%%|%{_ftp_arch}|'
$RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac/poldek/repos.d/pld.conf
cat <<'EOF' >
$RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/defaults/rpm/platform
# first platform file entry can't contain regexps
@@ -696,9 +715,7 @@
%attr(755,root,root) %{_libdir}/%{name}/start-vservers
%attr(755,root,root) %{_libdir}/%{name}/vprocunhide
%{_libdir}/%{name}/vserver.*
-%{_libdir}/%{name}/vserver-setup.*
%attr(755,root,root) %{_libdir}/%{name}/vserver-build
-%{_libdir}/%{name}/vserver-build.*
%attr(755,root,root) %{_libdir}/%{name}/vservers.grabinfo.sh
%attr(755,root,root) %{_libdir}/%{name}/vhashify
%attr(755,root,root) %{_libdir}/%{name}/vhashify.cron
@@ -748,8 +765,6 @@
%dir %{_sysconfdir}/vservers/.distributions/pld-ac
%dir %{_sysconfdir}/vservers/.distributions/pld-ac/poldek
%dir %{_sysconfdir}/vservers/.distributions/pld-ac/poldek/repos.d
-%dir %{_sysconfdir}/vservers/.distributions/pld-ac/poldek/pubkeys
-%{_sysconfdir}/vservers/.distributions/pld-ac/poldek/pubkeys/*.asc
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/vservers/.distributions/pld-ac/poldek/repos.d/*.conf
%dir %{_sysconfdir}/vservers/.distributions/pld-th
%dir %{_sysconfdir}/vservers/.distributions/pld-th/poldek
@@ -767,8 +782,8 @@
%dir %{_libdir}/%{name}/distributions/template
%attr(755,root,root) %{_libdir}/%{name}/distributions/template/init*
%attr(-,root,root) %{_libdir}/%{name}/distributions/redhat
-%{_libdir}/%{name}/vserver-build.*
%{_libdir}/%{name}/vserver-setup.functions
+%{_libdir}/%{name}/vserver-build.*
%{_libdir}/%{name}/defaults/fstab
%{_libdir}/%{name}/defaults/debootstrap.uri
%{_libdir}/%{name}/defaults/vunify-exclude
@@ -875,6 +890,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.138.2.30 2008-03-25 22:06:27 glen
+- resolve duplicate files
+- subst default ftp arch for pld-ac
+- ac.asc moved to libdir
+
Revision 1.138.2.29 2008-03-25 21:43:22 glen
- updated pld patch
- simplify rpm/platform creation
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/util-vserver.spec?r1=1.138.2.29&r2=1.138.2.30&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
