SPECS (AC-branch): util-vserver.spec - merged too much; rel 4

[glen]

Author: glen                         Date: Fri Mar 28 21:53:41 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged too much; rel 4

---- Files affected:
SPECS:
   util-vserver.spec (1.138.2.35 -> 1.138.2.36) 

---- Diffs:

================================================================
Index: SPECS/util-vserver.spec
diff -u SPECS/util-vserver.spec:1.138.2.35 SPECS/util-vserver.spec:1.138.2.36
--- SPECS/util-vserver.spec:1.138.2.35	Fri Mar 28 22:40:08 2008
+++ SPECS/util-vserver.spec	Fri Mar 28 22:53:36 2008
@@ -22,7 +22,7 @@
 Summary(pl.UTF-8):	Narzędzia dla linuksowych serwerów wirtualnych
 Name:		util-vserver
 Version:	0.30.214
-Release:	3.1
+Release:	4
 License:	GPL
 Group:		Applications/System
 Source0:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%{name}-%{version}.tar.bz2
@@ -844,7 +844,6 @@
 %attr(755,root,root) %{_sbindir}/vpoldek
 %attr(755,root,root) %{_sbindir}/vrpm
 %attr(755,root,root) %{_sbindir}/vyum
-%{_mandir}/man8/vserver-build.8*
 
 %files init
 %defattr(644,root,root,755)
@@ -871,12 +870,6 @@
 %{_mandir}/man8/rebootmgr.8*
 %{_mandir}/man8/vserver-copy.8*
 
-%files -n vserver-distro-alpine
-%defattr(644,root,root,755)
-%dir %{_libdir}/%{name}/distributions/alpine
-%attr(755,root,root) %{_libdir}/%{name}/distributions/alpine/initpost
-%attr(755,root,root) %{_libdir}/%{name}/distributions/alpine/initpre
-
 %files -n vserver-distro-centos
 %defattr(644,root,root,755)
 %{_libdir}/util-vserver/distributions/centos*
@@ -959,6 +952,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.138.2.36  2008-03-28 21:53:36  glen
+- merged too much; rel 4
+
 Revision 1.138.2.35  2008-03-28 21:40:08  glen
 - merge hawk changes from HEAD
 
================================================================

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