- alternative kernel support, to compile it for kernel-desktop use:

  ./builder -bb X11-driver-nvidia.spec --define alt_kernel desktop
  to compile for normal kernel you don't have to do anything special

Changed files:
    X11-driver-nvidia.spec -> 1.73

diff --git a/X11-driver-nvidia.spec b/X11-driver-nvidia.spec
index 0c69bd152dc487b5c4521d25f23c5559722f0e83..aed9bbe7dd5cf6c60c5cf566febced75942ba142 100644 (file)
--- a/X11-driver-nvidia.spec
+++ b/X11-driver-nvidia.spec
@@ -48,11 +48,11 @@ Patch1:             %{name}-conftest.patch
 # http://www.minion.de/files/1.0-6629/
 URL:           http://www.nvidia.com/object/linux.html
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:     kernel-module-build >= 3:2.6.7}
+%{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.7}
 %endif
 BuildRequires: %{kgcc_package}
 #BuildRequires:        X11-devel >= %{_min_x11}        # disabled for now
-BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: rpmbuild(macros) >= 1.308
 BuildRequires: sed >= 4.0
 BuildConflicts:        XFree86-nvidia
 Requires:      X11-Xserver
@@ -129,7 +129,7 @@ Tools for advanced control of nVidia graphic cards.
 %description progs -l pl
 Narzêdzia do zarz±dzania kartami graficznymi nVidia.
 
-%package -n kernel-video-nvidia
+%package -n kernel%{_alt_kernel}-video-nvidia
 Summary:       nVidia kernel module for nVidia Architecture support
 Summary(de):   Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
 Summary(pl):   Modu³ j±dra dla obs³ugi kart graficznych nVidia
@@ -142,17 +142,17 @@ Requires: dev >= 2.7.7-10
 Provides:      X11-driver-nvidia(kernel)
 Obsoletes:     XFree86-nvidia-kernel
 
-%description -n kernel-video-nvidia
+%description -n kernel%{_alt_kernel}-video-nvidia
 nVidia Architecture support for Linux kernel.
 
-%description -n kernel-video-nvidia -l de
+%description -n kernel%{_alt_kernel}-video-nvidia -l de
 Die nVidia-Architektur-Unterstützung für den Linux-Kern.
 
-%description -n kernel-video-nvidia -l pl
+%description -n kernel%{_alt_kernel}-video-nvidia -l pl
 Obs³uga architektury nVidia dla j±dra Linuksa. Pakiet wymagany przez
 sterownik nVidii dla Xorg/XFree86.
 
-%package -n kernel-smp-video-nvidia
+%package -n kernel%{_alt_kernel}-smp-video-nvidia
 Summary:       nVidia kernel module for nVidia Architecture support
 Summary(de):   Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
 Summary(pl):   Modu³ j±dra dla obs³ugi kart graficznych nVidia
@@ -164,13 +164,13 @@ Requires: dev >= 2.7.7-10
 Provides:      X11-driver-nvidia(kernel)
 Obsoletes:     XFree86-nvidia-kernel
 
-%description -n kernel-smp-video-nvidia
+%description -n kernel%{_alt_kernel}-smp-video-nvidia
 nVidia Architecture support for Linux kernel SMP.
 
-%description -n kernel-smp-video-nvidia -l de
+%description -n kernel%{_alt_kernel}-smp-video-nvidia -l de
 Die nVidia-Architektur-Unterstützung für den Linux-Kern SMP.
 
-%description -n kernel-smp-video-nvidia -l pl
+%description -n kernel%{_alt_kernel}-smp-video-nvidia -l pl
 Obs³uga architektury nVidia dla j±dra Linuksa SMP. Pakiet wymagany
 przez sterownik nVidii dla Xorg/XFree86.
 
@@ -291,16 +291,16 @@ EOF
 
 %postun        -p /sbin/ldconfig
 
-%post  -n kernel-video-nvidia
+%post  -n kernel%{_alt_kernel}-video-nvidia
 %depmod %{_kernel_ver}
 
-%postun        -n kernel-video-nvidia
+%postun        -n kernel%{_alt_kernel}-video-nvidia
 %depmod %{_kernel_ver}
 
-%post  -n kernel-smp-video-nvidia
+%post  -n kernel%{_alt_kernel}-smp-video-nvidia
 %depmod %{_kernel_ver}smp
 
-%postun        -n kernel-smp-video-nvidia
+%postun        -n kernel%{_alt_kernel}-smp-video-nvidia
 %depmod %{_kernel_ver}smp
 
 %if %{with userspace}
@@ -331,12 +331,12 @@ EOF
 %endif
 
 %if %{with kernel}
-%files -n kernel-video-nvidia
+%files -n kernel%{_alt_kernel}-video-nvidia
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*.ko*
 
 %if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-video-nvidia
+%files -n kernel%{_alt_kernel}-smp-video-nvidia
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/misc/*.ko*
 %endif