rpms/kernel/devel kernel-2.6.spec,1.2778,1.2779

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14343

Modified Files:
	kernel-2.6.spec 
Log Message:
Remove reference to the dead module_upgrade (Bill Nottingham).


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2778
retrieving revision 1.2779
diff -u -r1.2778 -r1.2779
--- kernel-2.6.spec	12 Oct 2006 16:46:19 -0000	1.2778
+++ kernel-2.6.spec	12 Oct 2006 16:48:43 -0000	1.2779
@@ -200,7 +200,7 @@
 # problems with the newer kernel or lack certain things that make
 # integration in the distro harder than needed.
 #
-%define package_conflicts kudzu < 1.2.5, initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.4, selinux-policy-targeted < 1.25.3-14
+%define package_conflicts initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.4, selinux-policy-targeted < 1.25.3-14
 
 #
 # The ld.so.conf.d file we install uses syntax older ldconfig's don't grok.
@@ -1646,10 +1646,6 @@
     /bin/sed -i -e 's/^DEFAULTKERNEL=kernel-smp$/DEFAULTKERNEL=kernel/' /etc/sysconfig/kernel || exit $?
   fi
 fi
-if [ -x /usr/sbin/module_upgrade ]
-then
-    /usr/sbin/module_upgrade %{rpmversion}-%{release} || exit $?
-fi
 /sbin/new-kernel-pkg --package kernel --mkinitrd --depmod --install %{KVERREL} || exit $?
 if [ -x /sbin/weak-modules ]
 then
@@ -1668,10 +1664,6 @@
 fi
 
 %post smp
-if [ -x /usr/sbin/module_upgrade ]
-then
-    /usr/sbin/module_upgrade %{rpmversion}-%{release}smp || exit $?
-fi
 /sbin/new-kernel-pkg --package kernel-smp --mkinitrd --depmod --install %{KVERREL}smp || exit $?
 if [ -x /sbin/weak-modules ]
 then
@@ -1693,10 +1685,6 @@
 if [ -f /etc/sysconfig/kernel ]; then
     /bin/sed -i -e 's/^DEFAULTKERNEL=kernel-smp$/DEFAULTKERNEL=kernel-PAE/' /etc/sysconfig/kernel
 fi
-if [ -x /usr/sbin/module_upgrade ]
-then
-    /usr/sbin/module_upgrade %{rpmversion}-%{release}PAE || exit $?
-fi
 /sbin/new-kernel-pkg --package kernel-PAE --mkinitrd --depmod --install %{KVERREL}PAE || exit $?
 if [ -x /sbin/weak-modules ]
 then
@@ -1720,10 +1708,6 @@
     /bin/sed -i -e 's/^DEFAULTKERNEL=kernel-xen[0U]/DEFAULTKERNEL=kernel-xen/' /etc/sysconfig/kernel || exit $?
   fi
 fi
-if [ -x /usr/sbin/module_upgrade ]
-then
-    /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen || exit $?
-fi
 if [ -e /proc/xen/xsd_kva -o ! -d /proc/xen ]; then
 	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install --multiboot=/%{image_install_path}/xen.gz-%{KVERREL} %{KVERREL}xen || exit $?
 else
@@ -1750,10 +1734,6 @@
 fi
 
 %post kdump
-if [ -x /usr/sbin/module_upgrade ]
-then
-    /usr/sbin/module_upgrade %{rpmversion}-%{release}-kdump || exit $?
-fi
 /sbin/new-kernel-pkg --package kernel-kdump --mkinitrd --depmod --install %{KVERREL}kdump || exit $?
 if [ -x /sbin/weak-modules ]
 then
@@ -2055,6 +2035,7 @@
 - Improve mm debugging in rmap sanity checking.
 - rt-mutex: fixup rt-mutex debug code
 - DLM: Fix recvmsg iovec length
+- Remove reference to the dead module_upgrade (Bill Nottingham).
 
 * Wed Oct 11 2006 Jon Masters <jcm at redhat.com>
 - Silence a stupid error in find-provides for non-kABI subpackages.