- AC-branch merge

Changed files:
    util-vserver.spec -> 1.142

diff --git a/util-vserver.spec b/util-vserver.spec
index 58f25477dea66469ddd291608d8b07a50dc59445..9f7a8d06bf7357966b21141d4e52fa7dd91491d2 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -438,10 +438,15 @@ sed -i 's/^glibc$/glibc64/' $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-
 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