- release 8

[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 14e4976c8c81352a4c9e1a374179401b80f78b7b..c928b0d60830a0943507a02b06585d31097cc590 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -19,19 +19,19 @@
 %endif
 
 %define                pname           xorg-driver-video-nvidia
-%define                rel             5
+%define                rel             8
 
 Summary:       Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(pl.UTF-8):     Sterowniki do kart graficznych nVidia GeForce/Quadro
 Name:          %{pname}%{_alt_kernel}
-Version:       173.14.09
+Version:       173.14.12
 Release:       %{rel}%{?with_multigl:.mgl}
 License:       nVidia Binary
 Group:         X11
 Source0:       http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run
-# Source0-md5: 02bc9536ad2800855c66684f4c981a74
+# Source0-md5: c099b6e15ef34187571403fb017d58a1
 Source1:       http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run
-# Source1-md5: 5f174d4fa50d774df8667c1c063adfb2
+# Source1-md5: 220b8dbe64d976e0045ee875cfa33c03
 Source2:       %{pname}-xinitrc.sh
 Patch0:                X11-driver-nvidia-GL.patch
 Patch1:                X11-driver-nvidia-desktop.patch
@@ -44,7 +44,8 @@ BuildRequires:        rpmbuild(macros) >= 1.379
 BuildRequires: sed >= 4.0
 BuildConflicts:        XFree86-nvidia
 Requires:      xorg-xserver-server
-Requires:      xorg-xserver-server(videodrv-abi) = 2.0
+Requires:      xorg-xserver-server(videodrv-abi) >= 2.0
+Requires:      xorg-xserver-server(videodrv-abi) <= 4.1
 Provides:      OpenGL = 2.1
 Provides:      OpenGL-GLX = 1.4
 Provides:      xorg-xserver-libglx
@@ -140,12 +141,12 @@ Narzędzia do zarządzania kartami graficznymi 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:      %{pname} = %{version}-%{rel}
 Provides:      X11-driver-nvidia(kernel)
 Obsoletes:     XFree86-nvidia-kernel
 
@@ -175,7 +176,7 @@ echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/s
 
 %build
 %if %{with kernel}
-cd usr/src/nv/
+cd usr/src/nv
 ln -sf Makefile.kbuild Makefile
 cat >> Makefile <<'EOF'
 
@@ -230,7 +231,6 @@ install usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \
 install usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
 
 ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so
-ln -sf libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/wfb.so
 
 %if %{with multigl}
 echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf
@@ -263,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.
 
@@ -314,7 +315,6 @@ fi
 %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so*
 %endif
 %attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.*
-%attr(755,root,root) %{_libdir}/xorg/modules/wfb.so
 %attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 
 %files devel