rpms/kernel/devel kernel-2.6.spec,1.2768,1.2769

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
unmacroise debuginfo generation


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2768
retrieving revision 1.2769
diff -u -r1.2768 -r1.2769
--- kernel-2.6.spec	11 Oct 2006 21:58:10 -0000	1.2768
+++ kernel-2.6.spec	12 Oct 2006 02:09:20 -0000	1.2769
@@ -1572,37 +1572,6 @@
 %endif
 %endif
 
-# First argument: 		dir with variant-named stripped ELF (e.g. boot)
-#				may be empty
-# Second argument, optional:	subpackage name (e.g. smp)
-# Third argument, optional:	suffix in %1 dir, if not -%2 (e.g. -PAE)
-# Fourth argument, optional:	glob of extra ELF files (e.g. boot/xen*-V-R)
-%define build_debuginfo() \
-%if "%{_enable_debug_packages}" == "1"\
-%ifnarch noarch\
-%%package %{?2:%{2}-}debuginfo\
-Summary: Debug information for package %{name}%{?2:-%{2}}\
-Group: Development/Debug\
-Requires: %{name}-debuginfo-common-%{_target_cpu} = %{KVERREL}\
-Provides: %{name}-%{?2:%{2}-}debuginfo-%{_target_cpu} = %{KVERREL}\
-%%description %{?2:%{2}-}debuginfo\
-This package provides debug information for package %{name}%{?2:-%{2}}.\
-This is required to use SystemTap with %{name}%{?2:-%{2}}-%{KVERREL}.\
-%%files %{?2:%{2}-}debuginfo\
-%defattr(-,root,root)\
-%if "%{?1}" != ""\
-/usr/lib/debug/%{?1}/*-%{KVERREL}%{?3}%{!?3:%{?2}}.debug\
-%endif\
-/usr/lib/debug/lib/modules/%{KVERREL}%{?2}\
-/usr/lib/debug/usr/src/kernels/%{KVERREL}%{?2:-%{2}}-%{_target_cpu}\
-%if "%{?4}" != ""\
-/usr/lib/debug/%{?4}.debug\
-%endif\
-%endif\
-%endif\
-%{nil}
-
-
 ###
 ### install
 ###
@@ -1846,7 +1815,24 @@
 %define elf_image_install_path %{?kernel_image_elf:%{image_install_path}}
 
 %if %{buildup}
-%build_debuginfo %{elf_image_install_path}
+%if "%{_enable_debug_packages}" == "1"
+%ifnarch noarch
+%package debuginfo
+Summary: Debug information for package %{name}
+Group: Development/Debug
+Requires: %{name}-debuginfo-common-%{_target_cpu} = %{KVERREL}
+Provides: %{name}-debuginfo-%{_target_cpu} = %{KVERREL}
+%description debuginfo
+This package provides debug information for package %{name}
+This is required to use SystemTap with %{name}-%{KVERREL}.
+%files debuginfo
+%defattr(-,root,root)
+/usr/lib/debug/%{elf_image_install_path}/*-%{KVERREL}.debug
+/usr/lib/debug/lib/modules/%{KVERREL}
+/usr/lib/debug/usr/src/kernels/%{KVERREL}-%{_target_cpu}
+%endif
+%endif
+
 %files
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}
@@ -1874,7 +1860,24 @@
 %endif
 
 %if %{buildpae}
-%build_debuginfo %{elf_image_install_path} PAE
+%if "%{_enable_debug_packages}" == "1"
+%ifnarch noarch
+%package PAE-debuginfo
+Summary: Debug information for package %{name}-PAE
+Group: Development/Debug
+Requires: %{name}-debuginfo-common-%{_target_cpu} = %{KVERREL}
+Provides: %{name}-%PAE-debuginfo-%{_target_cpu} = %{KVERREL}
+%description PAE-debuginfo
+This package provides debug information for package %{name}-PAE
+This is required to use SystemTap with %{name}-PAE-%{KVERREL}.
+%files PAE-debuginfo
+%defattr(-,root,root)
+/usr/lib/debug/%{elf_image_install_path}/*-%{KVERREL}-PAE.debug
+/usr/lib/debug/lib/modules/%{KVERREL}-PAE
+/usr/lib/debug/usr/src/kernels/%{KVERREL}-PAE-%{_target_cpu}
+%endif
+%endif
+
 %files PAE
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}PAE
@@ -1897,7 +1900,24 @@
 %endif
 
 %if %{buildsmp}
-%build_debuginfo %{elf_image_install_path} smp
+%if "%{_enable_debug_packages}" == "1"
+%ifnarch noarch
+%package smp-debuginfo
+Summary: Debug information for package %{name}-smp
+Group: Development/Debug
+Requires: %{name}-debuginfo-common-%{_target_cpu} = %{KVERREL}
+Provides: %{name}-%smp-debuginfo-%{_target_cpu} = %{KVERREL}
+%description smp-debuginfo
+This package provides debug information for package %{name}-smp
+This is required to use SystemTap with %{name}-smp-%{KVERREL}.
+%files smp-debuginfo
+%defattr(-,root,root)
+/usr/lib/debug/%{elf_image_install_path}/*-%{KVERREL}-smp.debug
+/usr/lib/debug/lib/modules/%{KVERREL}-smp
+/usr/lib/debug/usr/src/kernels/%{KVERREL}-smp-%{_target_cpu}
+%endif
+%endif
+
 %files smp
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}smp
@@ -1921,7 +1941,25 @@
 
 %if %{includexen}
 %if %{buildxen}
-%build_debuginfo %{elf_image_install_path} xen xen boot/xen*-%{KVERREL}
+%if "%{_enable_debug_packages}" == "1"
+%ifnarch noarch
+%package xen-debuginfo
+Summary: Debug information for package %{name}-xen
+Group: Development/Debug
+Requires: %{name}-debuginfo-common-%{_target_cpu} = %{KVERREL}
+Provides: %{name}-xen-debuginfo-%{_target_cpu} = %{KVERREL}
+%description xen-debuginfo
+This package provides debug information for package %{name}-xen
+This is required to use SystemTap with %{name}-xen-%{KVERREL}.
+%files xen-debuginfo
+%defattr(-,root,root)
+/usr/lib/debug/%{elf_image_install_path}/*-%{KVERREL}-xen.debug
+/usr/lib/debug/lib/modules/%{KVERREL}xen
+/usr/lib/debug/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}
+/usr/lib/debug/boot/xen*-%{KVERREL}.debug
+%endif
+%endif
+
 %files xen
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}xen
@@ -1949,8 +1987,24 @@
 %endif
 
 %if %{buildkdump}
-# The kdump kernel is always installed as an ELF file in %{image_install_path}.
-%build_debuginfo %{image_install_path} kdump
+%if "%{_enable_debug_packages}" == "1"
+%ifnarch noarch
+%package kdump-debuginfo
+Summary: Debug information for package %{name}-kdump
+Group: Development/Debug
+Requires: %{name}-debuginfo-common-%{_target_cpu} = %{KVERREL}
+Provides: %{name}-kdump-debuginfo-%{_target_cpu} = %{KVERREL}
+%description kdump-debuginfo
+This package provides debug information for package %{name}-kdump
+This is required to use SystemTap with %{name}-kdump-%{KVERREL}.
+%files kdump-debuginfo
+%defattr(-,root,root)
+/usr/lib/debug/%{image_install_path}/*-%{KVERREL}-kdump.debug
+/usr/lib/debug/lib/modules/%{KVERREL}-kdump
+/usr/lib/debug/usr/src/kernels/%{KVERREL}-kdump-%{_target_cpu}
+%endif
+%endif
+
 %files kdump
 %defattr(-,root,root)
 /%{image_install_path}/vmlinux-%{KVERREL}kdump
@@ -1987,6 +2041,7 @@
 - Silence some useless messages that still get printed with 'quiet'
 - 2.6.18.1rc1
 - utrace: fix signal deliver on ptrace_detach()
+- Unmacroise the debuginfo generation.
 
 * Wed Oct 11 2006 Jon Masters <jcm at redhat.com>
 - kABI dep fixes.