- fixes for changes in pci subsystem and power mgt. [2.6.9/2.6.10].

[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 6891e9c2d04a85a131395defc77cb9de2c4182a1..21b8370c3a16a0be0b86f79f6d574c0b2e598e72 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                _nv_ver         1.0
 %define                _nv_rel         6111
 %define                _min_x11        6.7.0

-%define                _rel            4
+%define                _rel            5

 #
 Summary:       Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips
 Summary(pl):   Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro
 #
 Summary:       Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips
 Summary(pl):   Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro


@@ -21,15 +21,19 @@ 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: 51e83be46f83c52102ccb8995b54f4e2
 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: 51e83be46f83c52102ccb8995b54f4e2

+# Source0-size:        8167999

 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
 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

+# Source1-size:        7333486

 Patch0:                %{name}-gcc34.patch
 Patch1:                %{name}-GL.patch
 Patch0:                %{name}-gcc34.patch
 Patch1:                %{name}-GL.patch

+Patch2:                %{name}-pci_x_class.patch
+Patch3:                %{name}-enable-pci.patch 
+Patch4:                %{name}-power-suspend.patch

 URL:           http://www.nvidia.com/object/linux.html
 BuildConflicts:        XFree86-nvidia
 BuildRequires: grep
 %{?with_dist_kernel:BuildRequires:     kernel-module-build >= 2.6.7}
 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
 BuildRequires: %{kgcc_package}
 BuildRequires: rpmbuild(macros) >= 1.153
 BuildRequires: sed >= 4.0


@@ -169,6 +173,9 @@ rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-%{_nv_rel}-pkg*
 %endif
 %patch0 -p1
 %patch1 -p1
 %endif
 %patch0 -p1
 %patch1 -p1

+%patch2 -p1
+%patch3 -p1
+%patch4 -p1

 sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
 
 %build
 sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
 
 %build