- proper obsoletes for vanilla

diff --git a/kernel.spec b/kernel.spec
index d6cd9385cb7387f99cad93c29d9ae852075d7c9a..10e832cb39764139811a05b23453a5417e096bb7 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -157,6 +157,7 @@ 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.
@@ -175,6 +176,7 @@ 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
@@ -194,6 +196,7 @@ 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
@@ -215,6 +218,7 @@ 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
@@ -232,6 +236,7 @@ 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
@@ -254,6 +259,7 @@ 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
 
@@ -275,6 +281,7 @@ 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
@@ -305,6 +312,7 @@ 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