- build requires kernel-source

[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 cc92c03c419cd3827503338a08c85d35cd203c1b..6891e9c2d04a85a131395defc77cb9de2c4182a1 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -9,7 +9,7 @@
 %define                _nv_ver         1.0
 %define                _nv_rel         6111
 %define                _min_x11        6.7.0
-%define                _rel            1
+%define                _rel            4
 #
 Summary:       Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips
 Summary(pl):   Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro
@@ -24,10 +24,12 @@ Source0:    http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVID
 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: 6c7b0c8b3ce5c34186e0c80042e6d046
 Patch0:                %{name}-gcc34.patch
+Patch1:                %{name}-GL.patch
 URL:           http://www.nvidia.com/object/linux.html
 BuildConflicts:        XFree86-nvidia
 BuildRequires: grep
 %{?with_dist_kernel:BuildRequires:     kernel-module-build >= 2.6.7}
+%{?with_dist_kernel:BuildRequires:     kernel-source >= 2.6.7}
 BuildRequires: %{kgcc_package}
 BuildRequires: rpmbuild(macros) >= 1.153
 BuildRequires: sed >= 4.0
@@ -98,7 +100,7 @@ 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}
 
@@ -166,6 +168,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 +239,7 @@ install nvidia-smp.ko \
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  
+%post
 /sbin/ldconfig
 cat << EOF
 
@@ -244,8 +247,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                            *
  *                                                     *
  *******************************************************