packages: util-vserver/util-vserver.spec - cleanups

[glen]

Author: glen                         Date: Wed Sep  9 06:16:10 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cleanups

---- Files affected:
packages/util-vserver:
   util-vserver.spec (1.244 -> 1.245) 

---- Diffs:

================================================================
Index: packages/util-vserver/util-vserver.spec
diff -u packages/util-vserver/util-vserver.spec:1.244 packages/util-vserver/util-vserver.spec:1.245
--- packages/util-vserver/util-vserver.spec:1.244	Thu Aug 13 09:30:05 2009
+++ packages/util-vserver/util-vserver.spec	Wed Sep  9 08:16:05 2009
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO
+# - %install is not re-entrant
 #
 # m68k and mips are the only not supported archs
 #
@@ -303,8 +305,8 @@
 Requires:	binutils
 Requires:	e2fsprogs
 Requires:	rpm
-Requires:	wget
 Requires:	vserver-distro-redhat = %{version}-%{release}
+Requires:	wget
 Requires:	yum
 
 %description -n vserver-distro-fedora
@@ -447,7 +449,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
@@ -550,8 +552,10 @@
 
 install -d $RPM_BUILD_ROOT/var/cache/vservers/poldek
 
-# we have our own initscript which does the same
+# cleanups
 rm -rf $RPM_BUILD_ROOT/dev
+rm -rf $RPM_BUILD_ROOT%{py_sitedir}/_libvserver.la
+# we have our own initscript which does the same
 rm -f $RPM_BUILD_ROOT%{_libdir}/util-vserver/vserver-wrapper
 rm -f $RPM_BUILD_ROOT%{_libdir}/util-vserver/vserver-init.functions
 rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-default
@@ -926,6 +930,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.245  2009/09/09 06:16:05  glen
+- cleanups
+
 Revision 1.244  2009/08/13 07:30:05  blues
 - proper provides for distro-debian
 
================================================================

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