SPECS (LINUX_2_6_22): kernel.spec - R: /sbin/depmod, instead of co...

[glen]

Author: glen                         Date: Tue Feb 12 08:31:32 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_22
---- Log message:
- R: /sbin/depmod, instead of conflicting on vserver-packages

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1796.2.54 -> 1.441.2.1796.2.55) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1796.2.54 SPECS/kernel.spec:1.441.2.1796.2.55
--- SPECS/kernel.spec:1.441.2.1796.2.54	Mon Feb 11 15:49:19 2008
+++ SPECS/kernel.spec	Tue Feb 12 09:31:26 2008
@@ -409,6 +409,7 @@
 Requires(post):	coreutils
 Requires(post):	geninitrd >= 2.57
 Requires(post):	module-init-tools >= 0.9.9
+Requires:	/sbin/depmod
 Requires:	coreutils
 Requires:	geninitrd >= 2.57
 Requires:	module-init-tools >= 0.9.9
@@ -416,13 +417,12 @@
 %if %{with xen0} || %{with xenU}
 Provides:	kernel(xen) = %{_xen_version}
 %endif
-Obsoletes:	kernel-smp
 Obsoletes:	kernel-misc-fuse
 Obsoletes:	kernel-modules
 Obsoletes:	kernel-net-hostap
 Obsoletes:	kernel-net-ieee80211
 Obsoletes:	kernel-net-ipp2p
-Conflicts:	vserver-packages
+Obsoletes:	kernel-smp
 Conflicts:	e2fsprogs < 1.29
 Conflicts:	isdn4k-utils < 3.1pre1
 Conflicts:	jfsutils < 1.1.3
@@ -1533,7 +1533,7 @@
 /lib/modules/%{kernel_release}/kernel/kernel
 
 /lib/modules/%{kernel_release}/kernel/lib
-# uncomment .../mm if you want enable  prefetch 
+# uncomment .../mm if you want enable  prefetch
 #/lib/modules/%{kernel_release}/kernel/mm
 /lib/modules/%{kernel_release}/kernel/net
 /lib/modules/%{kernel_release}/kernel/security
@@ -1703,6 +1703,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1796.2.55  2008-02-12 08:31:26  glen
+- R: /sbin/depmod, instead of conflicting on vserver-packages
+
 Revision 1.441.2.1796.2.54  2008-02-11 14:49:19  glen
 - another CVE for mmap() local root exploit (via sys_vmsplice)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1796.2.54&r2=1.441.2.1796.2.55&f=u