SPECS: util-vserver.spec - AC-branch merge

[glen]

Author: glen                         Date: Tue Mar  6 22:15:41 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- AC-branch merge

---- Files affected:
SPECS:
   util-vserver.spec (1.141 -> 1.142) 

---- Diffs:

================================================================
Index: SPECS/util-vserver.spec
diff -u SPECS/util-vserver.spec:1.141 SPECS/util-vserver.spec:1.142
--- SPECS/util-vserver.spec:1.141	Tue Mar  6 22:45:38 2007
+++ SPECS/util-vserver.spec	Tue Mar  6 23:15:36 2007
@@ -439,10 +439,15 @@
 sed -i 's/glibc\-\[0\-9\]\*\.rpm/glibc64\-\[0\-9\]\*\.rpm/' $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/rpmlist.d/00.lst
 %endif
 
-
-# baggins check this: needed but seems unused
+# XXX baggins check this: needed but seems unused
 install -d $RPM_BUILD_ROOT/var/cache/vservers
 
+# we have our own initscript which does the same
+rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-default
+rm -f $RPM_BUILD_ROOT/usr/lib/util-vserver/vserver-wrapper
+# probaly the part of them
+rm -f $RPM_BUILD_ROOT/etc/vservers.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -718,6 +723,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.142  2007/03/06 22:15:36  glen
+- AC-branch merge
+
 Revision 1.141  2007/03/06 21:45:38  glen
 - distro-* packages require -build; rel 7
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/util-vserver.spec?r1=1.141&r2=1.142&f=u