rpms/kernel/devel kernel-2.6.spec,1.2476,1.2477

[fedora-cvs-commits redhat com]

Author: jcm

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Need to call weak-modules on kernel update



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2476
retrieving revision 1.2477
diff -u -r1.2476 -r1.2477
--- kernel-2.6.spec	30 Jul 2006 07:04:46 -0000	1.2476
+++ kernel-2.6.spec	30 Jul 2006 08:11:04 -0000	1.2477
@@ -184,7 +184,7 @@
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 4.2.21-1
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 4.2.21-1, python
 
 Name: kernel
 Group: System Environment/Kernel
@@ -1426,6 +1426,7 @@
 fi
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}
 /sbin/new-kernel-pkg --package kernel --mkinitrd --depmod --install %{KVERREL}
+[ -f /sbin/weak-modules ] && /sbin/weak-modules --add-kernel %{KVERREL}
 
 %post devel
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
@@ -1438,6 +1439,7 @@
 %post smp
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}smp
 /sbin/new-kernel-pkg --package kernel-smp --mkinitrd --depmod --install %{KVERREL}smp
+[ -f /sbin/weak-modules ] && /sbin/weak-modules --add-kernel %{KVERREL}smp
 
 %post smp-devel
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
@@ -1453,6 +1455,7 @@
 fi
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}PAE
 /sbin/new-kernel-pkg --package kernel-PAE --mkinitrd --depmod --install %{KVERREL}PAE
+[ -f /sbin/weak-modules ] && /sbin/weak-modules --add-kernel %{KVERREL}PAE
 
 %post PAE-devel
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
@@ -1470,6 +1473,7 @@
 	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install %{KVERREL}xen
 fi
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
+[ -f /sbin/weak-modules ] && /sbin/weak-modules --add-kernel %{KVERREL}xen
 
 %post xen-devel
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
@@ -1482,6 +1486,7 @@
 %post kdump
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-kdump
 /sbin/new-kernel-pkg --package kernel-kdump --mkinitrd --depmod --install %{KVERREL}kdump
+[ -f /sbin/weak-modules ] && /sbin/weak-modules --add-kernel %{KVERREL}kdump
 
 %post kdump-devel
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
@@ -1493,18 +1498,23 @@
 
 %preun
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}
+[ -f /sbin/weak-modules ] && /sbin/weak-modules --remove-kernel %{KVERREL}
 
 %preun smp
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp
+[ -f /sbin/weak-modules ] && /sbin/weak-modules --remove-kernel %{KVERREL}smp
 
 %preun PAE
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}PAE
+[ -f /sbin/weak-modules ] && /sbin/weak-modules --remove-kernel %{KVERREL}PAE
 
 %preun kdump
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}kdump
+[ -f /sbin/weak-modules ] && /sbin/weak-modules --remove-kernel %{KVERREL}kdump
 
 %preun xen
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen
+[ -f /sbin/weak-modules ] && /sbin/weak-modules --remove-kernel %{KVERREL}xen
 
 ###
 ### file lists
@@ -1652,6 +1662,9 @@
 %endif
 
 %changelog
+* Sun Jul 30 2006 Jon Masters <jcm redhat com>
+- Wasn't calling weak-modules properly.
+
 * Sun Jul 30 2006 Dave Jones <davej redhat com>
 - 2.6.18rc3