packages (UTIL_VSERVER_0_30_215): util-vserver/util-vserver.spec - program ...

[glen]

Author: glen                         Date: Wed Jun 22 09:53:31 2011 GMT
Module: packages                      Tag: UTIL_VSERVER_0_30_215
---- Log message:
- program PATHS merge from HEAD

---- Files affected:
packages/util-vserver:
   util-vserver.spec (1.223 -> 1.223.4.1) 

---- Diffs:

================================================================
Index: packages/util-vserver/util-vserver.spec
diff -u packages/util-vserver/util-vserver.spec:1.223 packages/util-vserver/util-vserver.spec:1.223.4.1
--- packages/util-vserver/util-vserver.spec:1.223	Sun Feb 22 15:00:58 2009
+++ packages/util-vserver/util-vserver.spec	Wed Jun 22 11:53:26 2011
@@ -133,8 +133,8 @@
 
 This package contains utilities which are required to communicate with
 the Linux-Vserver enabled kernel, utilities which assist in building
-Vservers and SysV initscripts which start and stop Vservers and related
-tools.
+Vservers and SysV initscripts which start and stop Vservers and
+related tools.
 
 %description -l pl.UTF-8
 Ten pakiet dostarcza składniki i szkielet do tworzenia wirtualnych
@@ -401,17 +401,23 @@
 	--enable-apis=NOLEGACY \
 	--with-initscripts=sysv \
 	--%{?with_dietlibc:en}%{!?with_dietlibc:dis}able-dietlibc \
-	MKTEMP=/bin/mktemp \
-	MOUNT=/bin/mount \
-	PS=/bin/ps \
-	UMOUNT=/bin/umount \
+	FSCK=/sbin/fsck \
+	IONICE=%{_usrbin}/ionice \
 	IP=/sbin/ip \
 	IPTABLES=%{_usrsbin}/iptables \
+	MKTEMP=/bin/mktemp \
 	MODPROBE=/sbin/modprobe \
+	MOUNT=/bin/mount \
 	NAMEIF=/sbin/nameif \
+	PS=/bin/ps \
+	RESTORE=/sbin/restore \
 	RMMOD=/sbin/rmmod \
+	RSYNC=%{_usrbin}/rsync \
+	STRACE=%{_usrbin}/strace \
+	UMOUNT=/bin/umount \
 	VCONFIG=/sbin/vconfig \
 	WGET=%{_usrbin}/wget \
+# end
 
 %{__make} all
 %{?with_doc:%{__make} doc}
@@ -432,7 +438,7 @@
 chmod -R +rX $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/*
 
 for i in $RPM_BUILD_ROOT/etc/rc.d/init.d/v_* ; do
-	s=`basename $i | sed s/v_//`
+	s=$(basename $i | sed s/v_//)
 	cat >$RPM_BUILD_ROOT%{_sysconfdir}/vservices/$s << EOF
 # IP addresses/interfaces to bound $s service to
 #IP=10.0.0.1
@@ -904,6 +910,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.223.4.1  2011/06/22 09:53:26  glen
+- program PATHS merge from HEAD
+
 Revision 1.223  2009/02/22 14:00:58  areq
 - add centos.patch (fix install centos)
 - rel 14
================================================================

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