diff --git a/find-provides b/find-provides
index 595ec37..d2ba714 100644
--- a/find-provides
+++ b/find-provides
@@ -10,13 +10,22 @@ flavor=${1##*-}
 
 /usr/lib/rpm/find-provides "$@" <"$filelist"
 
-(
-    grep '\.ko$' "$filelist" | \
-        xargs -r $sourcedir/symsets.pl --list-exported-symbols;
-    grep '/Module\.symvers$' "$filelist" | while read f; do
-        $sourcedir/symsets.pl --list-exported-symbols --symvers-file="$f"
-    done
-) | awk -v flavor="$flavor" '
+case `uname -m` in
+ia64)
+	image="vmlinuz"
+	;;
+*)
+	image="vmlinux"
+esac
+while read f; do
+	test -e "$f" || continue
+	case "$f" in
+	*.ko | */$image* )
+		echo "$f"
+	esac
+done <"$filelist" | \
+	xargs -r $sourcedir/symsets.pl --list-exported-symbols | \
+	awk -v flavor="$flavor" '
 {
 	sub(/^0x0*/, "", $1);
 	if (!$1)
diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in
index fd8e0e9..b974b37 100644
--- a/kernel-binary.spec.in
+++ b/kernel-binary.spec.in
@@ -678,7 +678,7 @@ add_dirs_to_filelist() {
 # Collect the file lists.
 shopt -s nullglob
 > %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*gz %buildroot/boot/sym* ; do
+for file in %buildroot/boot/sym* ; do
 	f=${file##%buildroot}
 	echo "$f" >> %my_builddir/kernel-devel.files
 done
diff --git a/kernel-debug.changes b/kernel-debug.changes
index af8c04f..9f5aa32 100644
--- a/kernel-debug.changes
+++ b/kernel-debug.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides: fix for kernel-kdump.
+
+-------------------------------------------------------------------
+Sat May 23 22:18:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
+
 -------------------------------------------------------------------
 Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
 
diff --git a/kernel-debug.spec b/kernel-debug.spec
index 736b64f..26c89f4 100644
--- a/kernel-debug.spec
+++ b/kernel-debug.spec
@@ -62,7 +62,7 @@
 Name:           kernel-debug
 Summary:        A Debug Version of the Kernel
 Version:        2.6.30
-Release:        2
+Release:        3
 %if %using_buildservice
 %else
 %endif
@@ -604,7 +604,7 @@ add_dirs_to_filelist() {
 # Collect the file lists.
 shopt -s nullglob
 > %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*gz %buildroot/boot/sym* ; do
+for file in %buildroot/boot/sym* ; do
 	f=${file##%buildroot}
 	echo "$f" >> %my_builddir/kernel-devel.files
 done
@@ -790,6 +790,12 @@ kernel module packages) against the -debug flavor of the kernel.
 %endif
 
 %changelog
+* Sun May 24 2009 mmarek@suse.cz
+- rpm/find-provides: fix for kernel-kdump.
+* Sat May 23 2009 mmarek@suse.cz
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
 * Fri May 22 2009 teheo@suse.de
 - patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
   relocation.
diff --git a/kernel-default.changes b/kernel-default.changes
index af8c04f..9f5aa32 100644
--- a/kernel-default.changes
+++ b/kernel-default.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides: fix for kernel-kdump.
+
+-------------------------------------------------------------------
+Sat May 23 22:18:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
+
 -------------------------------------------------------------------
 Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
 
diff --git a/kernel-default.spec b/kernel-default.spec
index c86f0ba..6754b33 100644
--- a/kernel-default.spec
+++ b/kernel-default.spec
@@ -62,7 +62,7 @@
 Name:           kernel-default
 Summary:        The Standard Kernel
 Version:        2.6.30
-Release:        2
+Release:        3
 %if %using_buildservice
 %else
 %endif
@@ -619,7 +619,7 @@ add_dirs_to_filelist() {
 # Collect the file lists.
 shopt -s nullglob
 > %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*gz %buildroot/boot/sym* ; do
+for file in %buildroot/boot/sym* ; do
 	f=${file##%buildroot}
 	echo "$f" >> %my_builddir/kernel-devel.files
 done
@@ -802,6 +802,12 @@ kernel module packages) against the -default flavor of the kernel.
 %endif
 
 %changelog
+* Sun May 24 2009 mmarek@suse.cz
+- rpm/find-provides: fix for kernel-kdump.
+* Sat May 23 2009 mmarek@suse.cz
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
 * Fri May 22 2009 teheo@suse.de
 - patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
   relocation.
diff --git a/kernel-kdump.changes b/kernel-kdump.changes
index af8c04f..9f5aa32 100644
--- a/kernel-kdump.changes
+++ b/kernel-kdump.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides: fix for kernel-kdump.
+
+-------------------------------------------------------------------
+Sat May 23 22:18:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
+
 -------------------------------------------------------------------
 Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
 
diff --git a/kernel-kdump.spec b/kernel-kdump.spec
index d014535..224ec12 100644
--- a/kernel-kdump.spec
+++ b/kernel-kdump.spec
@@ -62,7 +62,7 @@
 Name:           kernel-kdump
 Summary:        kernel for kdump
 Version:        2.6.30
-Release:        2
+Release:        3
 %if %using_buildservice
 %else
 %endif
@@ -606,7 +606,7 @@ add_dirs_to_filelist() {
 # Collect the file lists.
 shopt -s nullglob
 > %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*gz %buildroot/boot/sym* ; do
+for file in %buildroot/boot/sym* ; do
 	f=${file##%buildroot}
 	echo "$f" >> %my_builddir/kernel-devel.files
 done
@@ -798,6 +798,12 @@ kernel module packages) against the -kdump flavor of the kernel.
 %endif
 
 %changelog
+* Sun May 24 2009 mmarek@suse.cz
+- rpm/find-provides: fix for kernel-kdump.
+* Sat May 23 2009 mmarek@suse.cz
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
 * Fri May 22 2009 teheo@suse.de
 - patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
   relocation.
diff --git a/kernel-legacy.changes b/kernel-legacy.changes
index af8c04f..9f5aa32 100644
--- a/kernel-legacy.changes
+++ b/kernel-legacy.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides: fix for kernel-kdump.
+
+-------------------------------------------------------------------
+Sat May 23 22:18:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
+
 -------------------------------------------------------------------
 Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
 
diff --git a/kernel-legacy.spec b/kernel-legacy.spec
index 70d21e4..7d0b8cd 100644
--- a/kernel-legacy.spec
+++ b/kernel-legacy.spec
@@ -62,7 +62,7 @@
 Name:           kernel-legacy
 Summary:        The Standard Kernel
 Version:        2.6.30
-Release:        2
+Release:        3
 %if %using_buildservice
 %else
 %endif
@@ -603,7 +603,7 @@ add_dirs_to_filelist() {
 # Collect the file lists.
 shopt -s nullglob
 > %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*gz %buildroot/boot/sym* ; do
+for file in %buildroot/boot/sym* ; do
 	f=${file##%buildroot}
 	echo "$f" >> %my_builddir/kernel-devel.files
 done
@@ -792,6 +792,12 @@ kernel module packages) against the -legacy flavor of the kernel.
 %endif
 
 %changelog
+* Sun May 24 2009 mmarek@suse.cz
+- rpm/find-provides: fix for kernel-kdump.
+* Sat May 23 2009 mmarek@suse.cz
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
 * Fri May 22 2009 teheo@suse.de
 - patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
   relocation.
diff --git a/kernel-ppc64.changes b/kernel-ppc64.changes
index af8c04f..9f5aa32 100644
--- a/kernel-ppc64.changes
+++ b/kernel-ppc64.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides: fix for kernel-kdump.
+
+-------------------------------------------------------------------
+Sat May 23 22:18:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
+
 -------------------------------------------------------------------
 Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
 
diff --git a/kernel-ppc64.spec b/kernel-ppc64.spec
index 60a8df8..0d279ca 100644
--- a/kernel-ppc64.spec
+++ b/kernel-ppc64.spec
@@ -62,7 +62,7 @@
 Name:           kernel-ppc64
 Summary:        Kernel for ppc64 Systems
 Version:        2.6.30
-Release:        2
+Release:        3
 %if %using_buildservice
 %else
 %endif
@@ -621,7 +621,7 @@ add_dirs_to_filelist() {
 # Collect the file lists.
 shopt -s nullglob
 > %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*gz %buildroot/boot/sym* ; do
+for file in %buildroot/boot/sym* ; do
 	f=${file##%buildroot}
 	echo "$f" >> %my_builddir/kernel-devel.files
 done
@@ -853,6 +853,12 @@ Authors:
 %endif
 
 %changelog
+* Sun May 24 2009 mmarek@suse.cz
+- rpm/find-provides: fix for kernel-kdump.
+* Sat May 23 2009 mmarek@suse.cz
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
 * Fri May 22 2009 teheo@suse.de
 - patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
   relocation.
diff --git a/kernel-ps3.changes b/kernel-ps3.changes
index af8c04f..9f5aa32 100644
--- a/kernel-ps3.changes
+++ b/kernel-ps3.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides: fix for kernel-kdump.
+
+-------------------------------------------------------------------
+Sat May 23 22:18:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
+
 -------------------------------------------------------------------
 Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
 
diff --git a/kernel-ps3.spec b/kernel-ps3.spec
index 0f4c7b7..57efee3 100644
--- a/kernel-ps3.spec
+++ b/kernel-ps3.spec
@@ -62,7 +62,7 @@
 Name:           kernel-ps3
 Summary:        kernel for ps3 bootloader
 Version:        2.6.30
-Release:        2
+Release:        3
 %if %using_buildservice
 %else
 %endif
@@ -606,7 +606,7 @@ add_dirs_to_filelist() {
 # Collect the file lists.
 shopt -s nullglob
 > %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*gz %buildroot/boot/sym* ; do
+for file in %buildroot/boot/sym* ; do
 	f=${file##%buildroot}
 	echo "$f" >> %my_builddir/kernel-devel.files
 done
@@ -792,6 +792,12 @@ kernel module packages) against the -default flavor of the kernel.
 %endif
 
 %changelog
+* Sun May 24 2009 mmarek@suse.cz
+- rpm/find-provides: fix for kernel-kdump.
+* Sat May 23 2009 mmarek@suse.cz
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
 * Fri May 22 2009 teheo@suse.de
 - patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
   relocation.
diff --git a/kernel-s390.changes b/kernel-s390.changes
index af8c04f..9f5aa32 100644
--- a/kernel-s390.changes
+++ b/kernel-s390.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides: fix for kernel-kdump.
+
+-------------------------------------------------------------------
+Sat May 23 22:18:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
+
 -------------------------------------------------------------------
 Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
 
diff --git a/kernel-s390.spec b/kernel-s390.spec
index b9a2732..3b32fdc 100644
--- a/kernel-s390.spec
+++ b/kernel-s390.spec
@@ -62,7 +62,7 @@
 Name:           kernel-s390
 Summary:        The Standard Kernel
 Version:        2.6.30
-Release:        2
+Release:        3
 %if %using_buildservice
 %else
 %endif
@@ -607,7 +607,7 @@ add_dirs_to_filelist() {
 # Collect the file lists.
 shopt -s nullglob
 > %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*gz %buildroot/boot/sym* ; do
+for file in %buildroot/boot/sym* ; do
 	f=${file##%buildroot}
 	echo "$f" >> %my_builddir/kernel-devel.files
 done
@@ -790,6 +790,12 @@ kernel module packages) against the -s390 flavor of the kernel.
 %endif
 
 %changelog
+* Sun May 24 2009 mmarek@suse.cz
+- rpm/find-provides: fix for kernel-kdump.
+* Sat May 23 2009 mmarek@suse.cz
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
 * Fri May 22 2009 teheo@suse.de
 - patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
   relocation.
diff --git a/kernel-source.changes b/kernel-source.changes
index af8c04f..9f5aa32 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides: fix for kernel-kdump.
+
+-------------------------------------------------------------------
+Sat May 23 22:18:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
+
 -------------------------------------------------------------------
 Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
 
diff --git a/kernel-source.spec b/kernel-source.spec
index 4dcd17e..9c16454 100644
--- a/kernel-source.spec
+++ b/kernel-source.spec
@@ -42,7 +42,7 @@ Url:            http://www.kernel.org/
 Name:           kernel-source
 Summary:        The Linux Kernel Sources
 Version:        2.6.30
-Release:        2
+Release:        3
 %if %using_buildservice
 %else
 %endif
@@ -235,6 +235,12 @@ done
 %endif
 
 %changelog
+* Sun May 24 2009 mmarek@suse.cz
+- rpm/find-provides: fix for kernel-kdump.
+* Sat May 23 2009 mmarek@suse.cz
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
 * Fri May 22 2009 teheo@suse.de
 - patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
   relocation.
diff --git a/kernel-syms.changes b/kernel-syms.changes
index af8c04f..9f5aa32 100644
--- a/kernel-syms.changes
+++ b/kernel-syms.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides: fix for kernel-kdump.
+
+-------------------------------------------------------------------
+Sat May 23 22:18:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
+
 -------------------------------------------------------------------
 Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
 
diff --git a/kernel-syms.spec b/kernel-syms.spec
index 4134bc6..649beab 100644
--- a/kernel-syms.spec
+++ b/kernel-syms.spec
@@ -33,7 +33,7 @@ Url:            http://www.kernel.org/
 Name:           kernel-syms
 Summary:        Kernel Symbol Versions (modversions)
 Version:        2.6.30
-Release:        2
+Release:        3
 %if %using_buildservice
 %else
 %define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
@@ -102,6 +102,12 @@ install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE
 %_docdir/%name/README.SUSE
 
 %changelog
+* Sun May 24 2009 mmarek@suse.cz
+- rpm/find-provides: fix for kernel-kdump.
+* Sat May 23 2009 mmarek@suse.cz
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
 * Fri May 22 2009 teheo@suse.de
 - patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
   relocation.
diff --git a/kernel-trace.changes b/kernel-trace.changes
index af8c04f..9f5aa32 100644
--- a/kernel-trace.changes
+++ b/kernel-trace.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides: fix for kernel-kdump.
+
+-------------------------------------------------------------------
+Sat May 23 22:18:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
+
 -------------------------------------------------------------------
 Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
 
diff --git a/kernel-trace.spec b/kernel-trace.spec
index 237a36c..b1804b5 100644
--- a/kernel-trace.spec
+++ b/kernel-trace.spec
@@ -62,7 +62,7 @@
 Name:           kernel-trace
 Summary:        The Realtime Linux Kernel
 Version:        2.6.30
-Release:        2
+Release:        3
 %if %using_buildservice
 %else
 %endif
@@ -609,7 +609,7 @@ add_dirs_to_filelist() {
 # Collect the file lists.
 shopt -s nullglob
 > %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*gz %buildroot/boot/sym* ; do
+for file in %buildroot/boot/sym* ; do
 	f=${file##%buildroot}
 	echo "$f" >> %my_builddir/kernel-devel.files
 done
@@ -812,6 +812,12 @@ Authors:
 %endif
 
 %changelog
+* Sun May 24 2009 mmarek@suse.cz
+- rpm/find-provides: fix for kernel-kdump.
+* Sat May 23 2009 mmarek@suse.cz
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
 * Fri May 22 2009 teheo@suse.de
 - patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
   relocation.
diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes
index af8c04f..9f5aa32 100644
--- a/kernel-vanilla.changes
+++ b/kernel-vanilla.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides: fix for kernel-kdump.
+
+-------------------------------------------------------------------
+Sat May 23 22:18:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
+
 -------------------------------------------------------------------
 Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
 
diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index e0c963d..8912a41 100644
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -62,7 +62,7 @@
 Name:           kernel-vanilla
 Summary:        The Standard Kernel - without any SUSE patches
 Version:        2.6.30
-Release:        2
+Release:        3
 %if %using_buildservice
 %else
 %endif
@@ -611,7 +611,7 @@ add_dirs_to_filelist() {
 # Collect the file lists.
 shopt -s nullglob
 > %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*gz %buildroot/boot/sym* ; do
+for file in %buildroot/boot/sym* ; do
 	f=${file##%buildroot}
 	echo "$f" >> %my_builddir/kernel-devel.files
 done
@@ -790,6 +790,12 @@ kernel module packages) against the -vanilla flavor of the kernel.
 %endif
 
 %changelog
+* Sun May 24 2009 mmarek@suse.cz
+- rpm/find-provides: fix for kernel-kdump.
+* Sat May 23 2009 mmarek@suse.cz
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
 * Fri May 22 2009 teheo@suse.de
 - patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
   relocation.
diff --git a/kernel-xen.changes b/kernel-xen.changes
index af8c04f..9f5aa32 100644
--- a/kernel-xen.changes
+++ b/kernel-xen.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides: fix for kernel-kdump.
+
+-------------------------------------------------------------------
+Sat May 23 22:18:05 CEST 2009 - mmarek@suse.cz
+
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
+
 -------------------------------------------------------------------
 Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
 
diff --git a/kernel-xen.spec b/kernel-xen.spec
index 1825ed9..8a60941 100644
--- a/kernel-xen.spec
+++ b/kernel-xen.spec
@@ -62,7 +62,7 @@
 Name:           kernel-xen
 Summary:        The Xen Kernel
 Version:        2.6.30
-Release:        2
+Release:        3
 %if %using_buildservice
 %else
 %endif
@@ -606,7 +606,7 @@ add_dirs_to_filelist() {
 # Collect the file lists.
 shopt -s nullglob
 > %my_builddir/kernel-devel.files
-for file in %buildroot/boot/vmlinux-*gz %buildroot/boot/sym* ; do
+for file in %buildroot/boot/sym* ; do
 	f=${file##%buildroot}
 	echo "$f" >> %my_builddir/kernel-devel.files
 done
@@ -798,6 +798,12 @@ kernel module packages) against the -xen flavor of the kernel.
 %endif
 
 %changelog
+* Sun May 24 2009 mmarek@suse.cz
+- rpm/find-provides: fix for kernel-kdump.
+* Sat May 23 2009 mmarek@suse.cz
+- rpm/find-provides, rpm/kernel-binary.spec.in, rpm/symsets.pl:
+  workaround to fix provides of built-in symbols: move vmlinux*.gz
+  back to -base and extract the provides from it.
 * Fri May 22 2009 teheo@suse.de
 - patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
   relocation.
diff --git a/source-timestamp b/source-timestamp
index 1d0576d..abad5da 100644
--- a/source-timestamp
+++ b/source-timestamp
@@ -1,3 +1,3 @@
-2009-05-22 15:47:06 +0200
-GIT Revision: 004d7f8460e6b2588aae824b928acd18fdb74cb4
+2009-05-24 10:36:30 +0200
+GIT Revision: b74f2b51e1f325297f352ba2ee9648782e4516d7
 GIT Branch: master
diff --git a/symsets.pl b/symsets.pl
index 17cc356..6c23738 100644
--- a/symsets.pl
+++ b/symsets.pl
@@ -107,6 +107,7 @@ use warnings;
 
 use Digest::MD5 qw(md5_hex);
 use Getopt::Long;
+use File::Temp qw(tempfile);
 eval { require Pod::Usage; };
 if ($@) {
     sub pod2usage {
@@ -126,6 +127,10 @@ Install Pod::Usage for a better help message.
     Pod::Usage->import('pod2usage');
 }
 
+my @cleanfiles = ();
+END {
+    unlink @cleanfiles;
+}
 
 our ($opt_verbose);
 our $kabi_badness = 0;
@@ -292,8 +297,20 @@ sub module_exports {
     my ($file) = @_;
     my (%crcs, %types, @res);
     my $mod = $file;
-    $mod =~ s/.*\/lib\/modules\/[^\/]*\/kernel\///;
-    $mod =~ s/\.(k?o|a)$//;
+
+    if ($file =~ /\/vmlinu[xz]/) {
+        $mod = "vmlinux";
+    } else {
+        $mod =~ s/.*\/lib\/modules\/[^\/]*\/kernel\///;
+        $mod =~ s/\.(k?o|a)$//;
+    }
+    if ($file =~ /\.gz$|\/vmlinuz/) {
+        my ($fh, $newfile) = tempfile();
+        close($fh);
+        push(@cleanfiles, $newfile);
+        system("gzip -cd $file >$newfile");
+        $file = $newfile;
+    }
     
     open(my $pipe, '-|', 'objdump', '-t', $file) or die "objdump -t $file: $!\n";
     while (<$pipe>) {