rpms/kernel/devel kernel.spec,1.615,1.616

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16506

Modified Files:
	kernel.spec 
Log Message:
* Tue Apr 15 2008 Jarod Wilson <jwilson at redhat.com>
- Fix kernel_variant_preun() to properly remove flavoured kernel
  entries from bootloader config (Mark McLoughlin)



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.615
retrieving revision 1.616
diff -u -r1.615 -r1.616
--- kernel.spec	15 Apr 2008 07:34:52 -0000	1.615
+++ kernel.spec	15 Apr 2008 14:08:32 -0000	1.616
@@ -1639,7 +1639,7 @@
 #
 %define kernel_variant_preun() \
 %{expand:%%preun %{?1}}\
-/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}%{?1} || exit $?\
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}%{?1:.%{1}} || exit $?\
 #if [ -x /sbin/weak-modules ]\
 #then\
 #    /sbin/weak-modules --remove-kernel %{KVERREL}%{?1} || exit $?\
@@ -1762,6 +1762,10 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Tue Apr 15 2008 Jarod Wilson <jwilson at redhat.com>
+- Fix kernel_variant_preun() to properly remove flavoured kernel
+  entries from bootloader config (Mark McLoughlin)
+
 * Tue Apr 15 2008 Dave Jones <davej at redhat.com>
 - 2.6.25-rc9-git1