X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=be25dfe8fb50d07698ab4615c53fa94f56355238;hp=bb0d246d8894966e9c49769244e45550e978e3cf;hb=e42b134d30602ecb8d8de4eb478f8f43254bb885;hpb=bf683e7a68ba7c42b4c22dda7263aa52c3d280e1

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index bb0d246..be25dfe 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -7,9 +7,9 @@
 %bcond_with	tls		# install libraries with tls support
 #
 %define		_nv_ver		1.0
-%define		_nv_rel		6106
+%define		_nv_rel		6111
 %define		_min_x11	6.7.0
-%define		_rel		3
+%define		_rel		4
 #
 Summary:	Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips
 Summary(pl):	Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro
@@ -20,10 +20,11 @@ License:	nVidia Binary
 Vendor:		nVidia Corp.
 Group:		X11/XFree86
 Source0:	http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run
-# Source0-md5:	5432f919f0211ce36b854d87108d7db0
+# Source0-md5:	51e83be46f83c52102ccb8995b54f4e2
 Source1:	http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2.run
-# Source1-md5:	024f21a3fa134bee8339adac64bdc77a
+# Source1-md5:	6c7b0c8b3ce5c34186e0c80042e6d046
 Patch0:		%{name}-gcc34.patch
+Patch1:		%{name}-GL.patch
 URL:		http://www.nvidia.com/object/linux.html
 BuildConflicts:	XFree86-nvidia
 BuildRequires:	grep
@@ -41,7 +42,6 @@ Provides:	X11-OpenGL-core
 Provides:	X11-OpenGL-libGL
 Provides:	XFree86-OpenGL-core
 Provides:	XFree86-OpenGL-libGL
-Provides:	X11-driver-nvidia
 Obsoletes:	Mesa
 Obsoletes:	X11-OpenGL-core
 Obsoletes:	X11-OpenGL-libGL
@@ -99,7 +99,8 @@ sterownik
 %package progs
 Summary:	Tools for advanced control of nVidia graphic cards
 Summary(pl):	Narzêdzia do zarz±dzania kartami graficznymi nVidia
-Group:		Application/System
+Group:		Applications/System
+Obsoletes:	XFree86-driver-nvidia-progs
 Requires:	%{name} = %{version}-%{release}
 
 %description progs
@@ -166,6 +167,7 @@ rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-%{_nv_rel}-pkg*
 %setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2
 %endif
 %patch0 -p1
+%patch1 -p1
 sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
 
 %build
@@ -236,7 +238,7 @@ install nvidia-smp.ko \
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	
+%post
 /sbin/ldconfig
 cat << EOF
 
@@ -244,8 +246,8 @@ cat << EOF
  *                                                     *
  *  NOTE:                                              *
  *  You must install:                                  *
- *  kernel-video-nvidia-%{version}-%{release}                       *
- *  for this driver to work correctly                  *
+ *  kernel(24)(-smp)-video-nvidia-%{version}             *
+ *  for this driver to work                            *
  *                                                     *
  *******************************************************