- let kernel require userspace, so there won't be situations when userspace is upgrad...

[packages/xorg-driver-video-nvidia.git] / xorg-driver-video-nvidia.spec

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 5145d4b7ffe4079fe9195b9ee15b1a7d9dea517b..8f5575a3af872d950729209c2bb412081b5c1c36 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -19,7 +19,7 @@
 %endif
 
 %define                pname           xorg-driver-video-nvidia
-%define                rel             4
+%define                rel             9
 
 Summary:       Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(pl.UTF-8):     Sterowniki do kart graficznych nVidia GeForce/Quadro
@@ -127,6 +127,7 @@ Summary:    Tools for advanced control of nVidia graphic cards
 Summary(pl.UTF-8):     Narzędzia do zarządzania kartami graficznymi nVidia
 Group:         Applications/System
 Requires:      %{name} = %{version}-%{release}
+Suggests:      pkgconfig
 Obsoletes:     XFree86-driver-nvidia-progs
 
 %description progs
@@ -135,17 +136,16 @@ Tools for advanced control of nVidia graphic cards.
 %description progs -l pl.UTF-8
 Narzędzia do zarządzania kartami graficznymi nVidia.
 
-%if %{with kernel}
 %package -n kernel%{_alt_kernel}-video-nvidia
 Summary:       nVidia kernel module for nVidia Architecture support
 Summary(de.UTF-8):     Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
 Summary(pl.UTF-8):     Moduł jądra dla obsługi kart graficznych nVidia
-Version:       %{version}
 Release:       %{rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
 Requires(post,postun): /sbin/depmod
 Requires:      dev >= 2.7.7-10
 %{?with_dist_kernel:%requires_releq_kernel}
+Requires:      %{name} = %{version}-%{release}
 Provides:      X11-driver-nvidia(kernel)
 Obsoletes:     XFree86-nvidia-kernel
 
@@ -158,7 +158,6 @@ Die nVidia-Architektur-Unterstützung für den Linux-Kern.
 %description -n kernel%{_alt_kernel}-video-nvidia -l pl.UTF-8
 Obsługa architektury nVidia dla jądra Linuksa. Pakiet wymagany przez
 sterownik nVidii dla Xorg/XFree86.
-%endif
 
 %prep
 cd %{_builddir}
@@ -264,8 +263,9 @@ rm -rf $RPM_BUILD_ROOT
 cat << 'EOF'
 NOTE: You must also install kernel module for this driver to work
   kernel-video-nvidia-%{version}
-  kernel-laptop-video-nvidia-%{version}
   kernel-desktop-video-nvidia-%{version}
+  kernel-laptop-video-nvidia-%{version}
+  kernel-vanilla-video-nvidia-%{version}
 
 Depending on which kernel brand you use.
 
@@ -278,13 +278,11 @@ fi
 
 %postun        -p /sbin/ldconfig
 
-%if %{with kernel}
 %post  -n kernel%{_alt_kernel}-video-nvidia
 %depmod %{_kernel_ver}
 
 %postun        -n kernel%{_alt_kernel}-video-nvidia
 %depmod %{_kernel_ver}
-%endif
 
 %if %{with userspace}
 %files