rpms/kernel/devel kernel.spec,1.77,1.78

[Roland McGrath (roland)]

Author: roland

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

Modified Files:
	kernel.spec 
Log Message:
spec fix for kdump kernel


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- kernel.spec	10 Aug 2007 03:51:42 -0000	1.77
+++ kernel.spec	10 Aug 2007 06:32:43 -0000	1.78
@@ -1668,13 +1668,13 @@
 #
 # This macro defines the %%files sections for a kernel package
 # and its devel and debuginfo packages.
-#	%%kernel_variant_files [-a <extra-files-glob>] [-e <extra-nonbinary>] <condition> <subpackage>
+#	%%kernel_variant_files [-k vmlinux] [-a <extra-files-glob>] [-e <extra-nonbinary>] <condition> <subpackage>
 #
-%define kernel_variant_files(a:e:) \
+%define kernel_variant_files(a:e:k:) \
 %if %{1}\
 %{expand:%%files %{?2}}\
 %defattr(-,root,root)\
-/%{image_install_path}/vmlinuz-%{KVERREL}%{?2}\
+/%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?2}\
 /boot/System.map-%{KVERREL}%{?2}\
 #/boot/symvers-%{KVERREL}%{?2}.gz\
 /boot/config-%{KVERREL}%{?2}\
@@ -1721,7 +1721,7 @@
 %kernel_variant_files %{with_debug} debug
 %kernel_variant_files %{with_pae} PAE
 %kernel_variant_files %{with_pae_debug} PAE-debug
-%kernel_variant_files %{with_kdump} kdump
+%kernel_variant_files -k vmlinux %{with_kdump} kdump
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 
@@ -1734,6 +1734,7 @@
 - fix ppc64 build breakage from "enable -g for assembly"
 - disable ppc64 vdso install pending eu-strip bug
 - clean up spec file sh scripting
+- spec fix for kdump kernel
 
 * Thu Aug 09 2007 Chuck Ebbert <cebbert at redhat.com>
 - update e1000e driver