SPECS (LINUX_2_6_16): kernel.spec - add C: vserver-packages due mo...

[glen]

Author: glen                         Date: Sun Oct 29 23:00:29 2006 GMT
Module: SPECS                         Tag: LINUX_2_6_16
---- Log message:
- add C: vserver-packages due module-init-tools being provided by it

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1558.2.37 -> 1.441.2.1558.2.38) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1558.2.37 SPECS/kernel.spec:1.441.2.1558.2.38
--- SPECS/kernel.spec:1.441.2.1558.2.37	Sun Oct 22 22:12:29 2006
+++ SPECS/kernel.spec	Mon Oct 30 00:00:23 2006
@@ -347,6 +347,7 @@
 Conflicts:	reiserfsprogs < %{_reiserfsprogs_ver}
 Conflicts:	udev < %{_udev_ver}
 Conflicts:	util-linux < %{_util_linux_ver}
+Conflicts:	vserver-packages
 Conflicts:	xfsprogs < %{_xfsprogs_ver}
 %if %{with xen0} || %{with xenU}
 ExclusiveArch:	%{ix86}
@@ -534,6 +535,7 @@
 %endif
 Conflicts:	reiserfsprogs < %{_reiserfsprogs_ver}
 Conflicts:	util-linux < %{_util_linux_ver}
+Conflicts:	vserver-packages
 Conflicts:	xfsprogs < %{_xfsprogs_ver}
 Autoreqprov:	no
 
@@ -1687,6 +1689,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1558.2.38  2006/10/29 23:00:23  glen
+- add C: vserver-packages due module-init-tools being provided by it
+
 Revision 1.441.2.1558.2.37  2006/10/22 20:12:29  hawk
 - bconded and disabled ReiserFS 4 support, for now it will not be included
   in any official Ac kernel
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1558.2.37&r2=1.441.2.1558.2.38&f=u