- drop kernel-vanilla stuff, fix alt_kernel version for rpm.org

diff --git a/kernel.spec b/kernel.spec
index b22a0b9966d988da2f52bb26224e90af156dd7ca..1912008826be8f764545f1eed8746305c2771473 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -13,7 +13,7 @@
 # modules will be looked from /lib/modules/%{kernel_release}
 # localversion is just that without version for "> localversion"
 %define                localversion    %{rel}
-%define                kernel_release  %{version}%{?alt_kernel:-%{alt_kernel}}-%{localversion}
+%define                kernel_release  %{version}%{?alt_kernel:_%{alt_kernel}}-%{localversion}
 
 Summary:       The Linux kernel (the core of the Linux operating system)
 Summary(de.UTF-8):     Der Linux-Kernel (Kern des Linux-Betriebssystems)
@@ -69,7 +69,6 @@ Suggests:     keyutils
 Suggests:      linux-firmware
 Provides:      %{name}(netfilter) = 20070806
 Provides:      %{name}(vermagic) = %{kernel_release}
-Obsoletes:     kernel%{_alt_kernel}-vanilla
 Obsoletes:     kernel-firmware
 Obsoletes:     kernel-modules
 Conflicts:     e2fsprogs < 1.29
@@ -157,7 +156,6 @@ Summary(de.UTF-8):  vmlinux - dekompressiertes Kernel Bild
 Summary(pl.UTF-8):     vmlinux - rozpakowany obraz jądra
 Group:         Base/Kernel
 Obsoletes:     kernel-smp-vmlinux
-Obsoletes:     kernel%{_alt_kernel}-vanilla-vmlinux
 
 %description vmlinux
 vmlinux - uncompressed kernel image.
@@ -176,7 +174,6 @@ Group:              Base/Kernel
 Requires(postun):      %{name} = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Obsoletes:     kernel-smp-drm
-Obsoletes:     kernel%{_alt_kernel}-vanilla-drm
 AutoReqProv:   no
 
 %description drm
@@ -196,7 +193,6 @@ Group:              Base/Kernel
 Requires(postun):      %{name} = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Obsoletes:     kernel-smp-pcmcia
-Obsoletes:     kernel%{_alt_kernel}-vanilla-pcmcia
 Conflicts:     pcmcia-cs < 3.1.21
 Conflicts:     pcmciautils < 004
 AutoReqProv:   no
@@ -218,7 +214,6 @@ Group:              Base/Kernel
 Requires(postun):      %{name} = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Obsoletes:     kernel-smp-sound-alsa
-Obsoletes:     kernel%{_alt_kernel}-vanilla-sound-alsa
 AutoReqProv:   no
 
 %description sound-alsa
@@ -236,7 +231,6 @@ Summary(de.UTF-8):  Header Dateien für den Linux-Kernel
 Summary(pl.UTF-8):     Pliki nagłówkowe jądra Linuksa
 Group:         Development/Building
 Provides:      %{name}-headers(netfilter) = 20070806
-Obsoletes:     kernel%{_alt_kernel}-vanilla-headers
 AutoReqProv:   no
 
 %description headers
@@ -259,7 +253,6 @@ Summary(de.UTF-8):  Development Dateien die beim Kernel Modul kompilationen gebra
 Summary(pl.UTF-8):     Pliki służące do budowania modułów jądra
 Group:         Development/Building
 Requires:      %{name}-headers = %{epoch}:%{version}-%{release}
-Obsoletes:     kernel%{_alt_kernel}-vanilla-module-build
 Conflicts:     rpmbuild(macros) < 1.652
 AutoReqProv:   no
 
@@ -281,7 +274,6 @@ Summary(de.UTF-8):  Der Kernel Quelltext
 Summary(pl.UTF-8):     Kod źródłowy jądra Linuksa
 Group:         Development/Building
 Requires:      %{name}-module-build = %{epoch}:%{version}-%{release}
-Obsoletes:     kernel%{_alt_kernel}-vanilla-source
 AutoReqProv:   no
 
 %description source
@@ -312,7 +304,6 @@ Summary:    Kernel documentation
 Summary(de.UTF-8):     Kernel Dokumentation
 Summary(pl.UTF-8):     Dokumentacja do jądra Linuksa
 Group:         Documentation
-Obsoletes:     kernel%{_alt_kernel}-vanilla-doc
 AutoReqProv:   no
 
 %description doc