X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=0a606919148ab85b0ce02e13776f45419f3882dc;hp=f1b4106669b2a1ca8cf3b6cf8eb28dff8bfa6619;hb=4a185d32f2e6f402d5e3db3b7114ab59c872249c;hpb=979870897df22a2fd10d9b4b484bb755224e0c7e diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index f1b4106..0a60691 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -3,13 +3,30 @@ %bcond_without dist_kernel # without distribution kernel %bcond_without smp # without smp packages %bcond_without kernel # without kernel packages +%bcond_without incall # include all tarballs +%bcond_without userspace # don't build userspace programs %bcond_with verbose # verbose build (V=1) # %define _nv_ver 1.0 -%define _nv_rel 7174 +%define _nv_rel 7676 %define _min_x11 6.7.0 -%define _rel 2 +%define _rel 1 # +%define need_x86 0 +%define need_x8664 0 +%if %{with incall} +%define need_x86 1 +%define need_x8664 1 +%else +%ifarch %{ix86} +%define need_x86 1 +%endif +%ifarch %{x8664} +%define need_x8664 1 +%endif +%endif +# + Summary: Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips Summary(pl): Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro Name: X11-driver-nvidia @@ -17,18 +34,21 @@ Version: %{_nv_ver}.%{_nv_rel} Release: %{_rel} License: nVidia Binary Vendor: nVidia Corp. -Group: X11/XFree86 +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 -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 +%if %{need_x86} +Source0: http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg0.run +# Source0-md5: 2474c5513006668b0fba401e042dc009 +%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}-pkg0.run +# Source1-md5: 06a0a2d06c7f849510b4682d9d13946a +%endif Patch0: %{name}-gcc34.patch Patch1: %{name}-GL.patch Patch2: %{name}-conftest.patch # http://www.minion.de/files/1.0-6629/ URL: http://www.nvidia.com/object/linux.html -BuildConflicts: XFree86-nvidia BuildRequires: grep %{?with_dist_kernel:BuildRequires: kernel-module-build >= 2.6.7} BuildRequires: %{kgcc_package} @@ -36,6 +56,7 @@ 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} @@ -61,24 +82,24 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %endif %description -This driver set adds improved 2D functionality to the XFree86 4.0 X +This driver set adds improved 2D functionality to the Xorg/XFree86 X server as well as high performance OpenGL acceleration, AGP support, support for most flat panels, and 2D multiple monitor support. Hardware: nVidia TNT, TNT2, GeForce, or Quadro based graphics accelerator. The nVidia NV1 and RIVA 128/128ZX chips are supported in -the base XFree86 4.0 install and are not supported by this driver set. - -Software: Linux kernel >= 2.2.12, XFree86 >= 4.0. +the base Xorg/XFree86 install and are not supported by this driver +set. %description -l pl -Usprawnione sterowniki dla kart graficznych nVidia do serwera XFree86 -4.0, daj±ce wysokowydajn± akceleracjê OpenGL, obs³ugê AGP i wielu -monitorów 2D. +Usprawnione sterowniki dla kart graficznych nVidia do serwera +Xorg/XFree86, daj±ce wysokowydajn± akceleracjê OpenGL, obs³ugê AGP i +wielu monitorów 2D. -Obs³uguj± karty nVidia TNT/TNT2/GeForce/Quadro do serwera XFree86 4.0; -Karty nVidia NV1 i Riva 128/128ZX s± obs³ugiwane przez sterownik nv z -pakietów XFree86 - NIE s± obs³ugiwane przez ten pakiet. +Obs³uguj± karty nVidia TNT/TNT2/GeForce/Quadro do serwera +Xorg/XFree86; Karty nVidia NV1 i Riva 128/128ZX s± obs³ugiwane przez +sterownik nv z pakietów Xorg/XFree8 - NIE s± obs³ugiwane przez ten +pakiet. %package devel Summary: OpenGL for X11R6 development (only gl?.h) @@ -101,8 +122,8 @@ sterownik Summary: Tools for advanced control of nVidia graphic cards Summary(pl): Narzêdzia do zarz±dzania kartami graficznymi nVidia Group: Applications/System -Obsoletes: XFree86-driver-nvidia-progs Requires: %{name} = %{version}-%{release} +Obsoletes: XFree86-driver-nvidia-progs %description progs Tools for advanced control of nVidia graphic cards. @@ -117,7 +138,6 @@ Summary(pl): Modu Version: %{_nv_ver}.%{_nv_rel} Release: %{_rel}@%{_kernel_ver_str} Group: Base/Kernel -PreReq: modutils >= 2.3.18-2 Requires(post,postun): /sbin/depmod Requires: dev >= 2.7.7-10 %{?with_dist_kernel:%requires_releq_kernel_up} @@ -132,7 +152,7 @@ Die nVidia-Architektur-Unterst %description -n kernel-video-nvidia -l pl Obs³uga architektury nVidia dla j±dra Linuksa. Pakiet wymagany przez -sterownik nVidii dla XFree86 4. +sterownik nVidii dla Xorg/XFree86. %package -n kernel-smp-video-nvidia Summary: nVidia kernel module for nVidia Architecture support @@ -140,7 +160,6 @@ Summary(de): Das nVidia-Kern-Modul f Summary(pl): Modu³ j±dra dla obs³ugi kart graficznych nVidia Release: %{_rel}@%{_kernel_ver_str} Group: Base/Kernel -PreReq: modutils >= 2.3.18-2 Requires(post,postun): /sbin/depmod Requires: dev >= 2.7.7-10 %{?with_dist_kernel:%requires_releq_kernel_smp} @@ -155,17 +174,17 @@ Die nVidia-Architektur-Unterst %description -n kernel-smp-video-nvidia -l pl Obs³uga architektury nVidia dla j±dra Linuksa SMP. Pakiet wymagany -przez sterownik nVidii dla XFree86 4. +przez sterownik nVidii dla Xorg/XFree86. %prep cd %{_builddir} rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-%{_nv_rel}-pkg* %ifarch %{ix86} /bin/sh %{SOURCE0} --extract-only -%setup -qDT -n NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1 +%setup -qDT -n NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg0 %else /bin/sh %{SOURCE1} --extract-only -%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2 +%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg0 %endif %patch0 -p1 %patch1 -p1 @@ -204,6 +223,8 @@ done %install rm -rf $RPM_BUILD_ROOT + +%if %{with userspace} install -d $RPM_BUILD_ROOT%{_libdir}/modules/{drivers,extensions} \ $RPM_BUILD_ROOT{/usr/include/GL,/usr/%{_lib}/tls,%{_bindir}} @@ -235,6 +256,7 @@ ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so # OpenGL ABI for Linux compatibility ln -sf %{_libdir}/libGL.so.1 $RPM_BUILD_ROOT/usr/%{_lib}/libGL.so.1 ln -sf %{_libdir}/libGL.so $RPM_BUILD_ROOT/usr/%{_lib}/libGL.so +%endif %if %{with kernel} cd usr/src/nv/ @@ -279,10 +301,11 @@ EOF %postun -n kernel-smp-video-nvidia %depmod %{_kernel_ver}smp +%if %{with userspace} %files %defattr(644,root,root,755) %doc LICENSE -%doc usr/share/doc/{README,NVIDIA_Changelog,XF86Config.sample} +%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample} #%%lang(de) %doc usr/share/doc/README.DE %attr(755,root,root) %{_libdir}/libGL.so.*.* %attr(755,root,root) %{_libdir}/libGL.so @@ -303,6 +326,7 @@ EOF %attr(755,root,root) /usr/%{_lib}/libGL.so %attr(755,root,root) %{_libdir}/modules/extensions/libglx.so* %attr(755,root,root) %{_libdir}/modules/drivers/nvidia_drv.o +%endif %if %{with kernel} %files -n kernel-video-nvidia @@ -316,6 +340,7 @@ EOF %endif %endif +%if %{with userspace} %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so @@ -325,4 +350,6 @@ EOF %files progs %defattr(644,root,root,755) +%doc usr/share/doc/nvidia-settings-user-guide.txt %attr(755,root,root) %{_bindir}/nvidia-settings +%endif