- added PL description, fixed icon and exec paths

[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 77bef5c4f6861da07a4c44fc3b144cc77435b8b6..f75eb770a510a295546db52d1b5811b6ef09216b 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -8,7 +8,7 @@
 %bcond_with    verbose         # verbose build (V=1)
 #
 %define                _nv_ver         1.0
-%define                _nv_rel         8178
+%define                _nv_rel         8756
 %define                _min_x11        6.7.0
 %define                _rel            0.1
 #
@@ -32,38 +32,35 @@ Name:               xorg-driver-video-nvidia
 Version:       %{_nv_ver}.%{_nv_rel}
 Release:       %{_rel}
 License:       nVidia Binary
-Vendor:                nVidia Corp.
 Group:         X11
 # why not pkg0!?
 %if %{need_x86}
 Source0:       http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run
-# Source0-md5: bc9d459bfeee93735e3959de041635df
+# Source0-md5: 67293549b90f549ca9210743eaa5b09c
 %endif
 %if %{need_x8664}
 Source1:       http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg1.run
-# Source1-md5: 0da016f8d5138c1ee51b7fa375821574
+# Source1-md5: cbefbe43bca916f536872a994da8dcec
 %endif
-Patch0:                X11-driver-nvidia-gcc34.patch
+#Patch0:       X11-driver-nvidia-gcc34.patch
 Patch1:                X11-driver-nvidia-GL.patch
 # http://www.minion.de/files/1.0-6629/
 URL:           http://www.nvidia.com/object/linux.html
-BuildRequires: grep
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:     kernel-module-build >= 2.6.7}
+%{?with_dist_kernel:BuildRequires:     kernel-module-build >= 3:2.6.7}
 %endif
 BuildRequires: %{kgcc_package}
 BuildRequires: rpmbuild(macros) >= 1.213
 BuildRequires: sed >= 4.0
-BuildRequires: textutils
-#BuildRequires:        X11-devel >= %{_min_x11}        # disabled for now
 BuildConflicts:        XFree86-nvidia
-Requires:      X11-Xserver
-Requires:      X11-libs >= %{_min_x11}
-Requires:      X11-modules >= %{_min_x11}
+Requires:      xorg-xserver-server
+Provides:      OpenGL = 1.5
+Provides:      OpenGL-GLX
 Provides:      X11-OpenGL-core
 Provides:      X11-OpenGL-libGL
 Provides:      XFree86-OpenGL-core
 Provides:      XFree86-OpenGL-libGL
+Provides:      xorg-xserver-modules-libglx
 Obsoletes:     Mesa
 Obsoletes:     X11-OpenGL-core
 Obsoletes:     X11-OpenGL-libGL
@@ -102,6 +99,8 @@ Summary:     OpenGL for X11R6 development (only gl?.h)
 Summary(pl):   Pliki nag³ówkowe OpenGL dla systemu X11R6 (tylko gl?.h)
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Provides:      OpenGL-GLX-devel
+Provides:      OpenGL-devel = 1.5
 Provides:      OpenGL-devel-base
 Obsoletes:     OpenGL-devel-base
 Obsoletes:     XFree86-driver-nvidia-devel
@@ -182,7 +181,7 @@ 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}-pkg1
 %endif
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/src/nv/Makefile.kbuild
 
@@ -332,7 +331,7 @@ EOF
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
-/usr/include/GL/*.h
+%{_includedir}/GL/*.h
 # -static
 %{_libdir}/libXvMCNVIDIA.a