SPECS (LINUX_2_6): kernel.spec - R: /sbin/depmod, instead of confl...

[glen]

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

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1840 -> 1.441.2.1841) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1840 SPECS/kernel.spec:1.441.2.1841
--- SPECS/kernel.spec:1.441.2.1840	Mon Feb 11 22:05:21 2008
+++ SPECS/kernel.spec	Tue Feb 12 09:32:05 2008
@@ -364,6 +364,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
@@ -371,13 +372,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
@@ -1603,6 +1603,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1841  2008-02-12 08:32:05  glen
+- R: /sbin/depmod, instead of conflicting on vserver-packages
+
 Revision 1.441.2.1840  2008-02-11 21:05:21  zbyniu
 - ppc-export-copy_page.patch added, builds on ppc
 
================================================================

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