- up to 7182; all those 7174 patches are obsolete as i noticed from the changelog,

[packages/X11-driver-nvidia-legacy.git] / X11-driver-nvidia-legacy.spec

diff --git a/X11-driver-nvidia-legacy.spec b/X11-driver-nvidia-legacy.spec
index 45667ead5fc0bdbfa5d70cc2708ae5ac548964db..550d910368633c337ef90389fc84b6e213051f27 100644 (file)
--- a/X11-driver-nvidia-legacy.spec
+++ b/X11-driver-nvidia-legacy.spec
@@ -7,9 +7,9 @@
 #
 ### DON'T CHANGE THIS ###############
 %define                _nv_ver         1.0
-%define                _nv_rel         7174
+%define                _nv_rel         7182
 %define                _min_x11        6.7.0
-%define                _rel            8
+%define                _rel            0.1
 #####################################
 #
 %define                oldname         X11-driver-nvidia
@@ -23,9 +23,9 @@ License:      nVidia Binary
 Group:         X11
 # why not pkg0!?
 Source0:       http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run
-# Source0-md5: e9840ae34ae9f5a3dc7d0fafe040c8af
+# Source0-md5: a7c84815943dc4784a207608abf2e5d6
 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: 125ec3ecc64202c6c27ef762a438d0f0
+# Source1-md5: 5a670a73a8887bdc776064aecae8f769
 Patch0:                %{name}-gcc34.patch
 Patch1:                %{name}-GL.patch
 Patch2:                %{name}-conftest.patch
@@ -40,11 +40,9 @@ Patch9:              %{name}-build-fix.patch
 URL:           http://www.nvidia.com/object/linux.html
 BuildRequires: %{kgcc_package}
 #BuildRequires:        X11-devel >= %{_min_x11}        # disabled for now
-BuildRequires: grep
-%{?with_dist_kernel:BuildRequires:     kernel-module-build >= 2.6.7}
+%{?with_dist_kernel:BuildRequires:     kernel-module-build >= 3:2.6.7}
 BuildRequires: rpmbuild(macros) >= 1.213
 BuildRequires: sed >= 4.0
-BuildRequires: textutils
 BuildConflicts:        XFree86-nvidia
 Requires:      X11-Xserver
 Requires:      X11-libs >= %{_min_x11}
@@ -73,13 +71,13 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %endif
 
 %description
-This driver set adds improved 2D functionality to the Xorg X
-server as well as high performance OpenGL acceleration, AGP support,
-support for most flat panels, and multiple monitor support.
+This driver set adds improved 2D functionality to the Xorg X server as
+well as high performance OpenGL acceleration, AGP support, support for
+most flat panels, and multiple monitor support.
 
 Hardware: nVidia TNT, TNT2, GeForce, old GeForce2 or Quadro based
-graphics accelerator. New GeForce2, GeForce3 and GeForce4 adapters
-are supported by X11-driver-nvidia package. The nVidia NV1 and RIVA
+graphics accelerator. New GeForce2, GeForce3 and GeForce4 adapters are
+supported by X11-driver-nvidia package. The nVidia NV1 and RIVA
 128/128ZX chips are supported in the base Xorg or XFree86 install and
 are not supported by this driver set.
 
@@ -186,18 +184,18 @@ rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-%{_nv_rel}-pkg*
 /bin/sh %{SOURCE1} --extract-only
 %setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2
 %endif
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 #%patch2 -p1
 %if %{with verbose}
 %patch3 -p1
 %endif
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p0
-%patch9 -p1
+#%patch4 -p0
+#%patch5 -p0
+#%patch6 -p0
+#%patch7 -p0
+#%patch8 -p0
+#%patch9 -p1
 sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
 
 %build