%define _nv_ver 1.0
%define _nv_rel 5336
%define _nv_pkg pkg0
+%define _min_x11 6.7.0
+%define _rel 4
#
Summary: Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips
Summary(pl): Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro
-Name: XFree86-driver-nvidia
+Name: X11-driver-nvidia
Version: %{_nv_ver}.%{_nv_rel}
-%define _rel 3
Release: %{_rel}
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}-%{_nv_pkg}.run
# Source0-md5: 2ceffa20391d5471b8a483101563eccb
-Patch0: %{name}-cleanups.patch
-Patch1: %{name}-api_call.patch
+Patch0: %{name}-gcc34.patch
+Patch1: %{name}-api_calls.patch
URL: http://www.nvidia.com/object/linux.html
BuildConflicts: XFree86-nvidia
BuildRequires: grep
BuildRequires: %{kgcc_package}
BuildRequires: rpmbuild(macros) >= 1.153
BuildRequires: textutils
-Requires: XFree86-Xserver
-Requires: XFree86-libs >= 4.0.1
-Requires: XFree86-modules >= 4.0.1
-Requires: XFree86-nvidia-kernel
+Requires: X11-driver-nvidia(kernel)
+Requires: X11-Xserver
+Requires: X11-libs >= %{_min_x11}
+Requires: X11-modules >= %{_min_x11}
%{?with_tls:Requires: glibc(tls)}
+Provides: X11-OpenGL-core
+Provides: X11-OpenGL-libGL
Provides: XFree86-OpenGL-core
+Provides: XFree86-OpenGL-libGL
+Provides: XFree86-driver-nvidia
Obsoletes: Mesa
+Obsoletes: X11-OpenGL-core
+Obsoletes: X11-OpenGL-libGL
Obsoletes: XFree86-OpenGL-core
Obsoletes: XFree86-OpenGL-libGL
+Obsoletes: XFree86-driver-nvidia
Obsoletes: XFree86-nvidia
Conflicts: XFree86-OpenGL-devel <= 4.2.0-3
ExclusiveArch: %{ix86}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _noautoreqdep libGL.so.%{_nv_ver}.%{_nv_rel} libGLcore.so.%{_nv_ver}.%{_nv_rel}
+%define _noautoreqdep libGL.so.1 libGLcore.so.1
%define _prefix /usr/X11R6
%description
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}
+Requires: %{name} = %{version}-%{release}
Provides: OpenGL-devel-base
Obsoletes: OpenGL-devel-base
+Obsoletes: XFree86-driver-nvidia-devel
Conflicts: XFree86-OpenGL-devel < 4.3.99.902-0.3
%description devel
Summary: Tools for advanced control of nVidia graphic cards
Summary(pl): Narzêdzia do zarz±dzania kartami graficznymi nVidia
Group: Application/System
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
%description progs
Tools for advanced control of nVidia graphic cards.
Requires(post,postun): /sbin/depmod
Requires: dev >= 2.7.7-10
%{?with_dist_kernel:%requires_releq_kernel_up}
-Provides: XFree86-nvidia-kernel
+Provides: X11-driver-nvidia(kernel)
Obsoletes: XFree86-nvidia-kernel
%description -n kernel-video-nvidia
Requires(post,postun): /sbin/depmod
Requires: dev >= 2.7.7-10
%{?with_dist_kernel:%requires_releq_kernel_smp}
-Provides: XFree86-nvidia-kernel
+Provides: X11-driver-nvidia(kernel)
Obsoletes: XFree86-nvidia-kernel
%description -n kernel-smp-video-nvidia