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=4311cb49e9d3f87d9322482dd3dd442bcbdbfd4b;hp=75788b8e375f0133c8fc56131b2d22032842202a;hb=7056b9df415a4492d15e8298028241c0551e5510;hpb=a116bc07fab92803be673bb3652b643fcc2998b3 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 75788b8..4311cb4 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -20,20 +20,21 @@ %endif %define no_install_post_check_so 1 +%define rel 6 %define pname xorg-driver-video-nvidia Summary: Linux Drivers for nVidia GeForce/Quadro Chips Summary(hu.UTF-8): Linux meghajtók nVidia GeForce/Quadro chipekhez Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro -Name: %{pname} -Version: 290.10 -Release: 7 +Name: %{pname}%{_alt_kernel} +Version: 304.43 +Release: %{rel} Epoch: 1 License: nVidia Binary Group: X11 -Source0: http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run -# Source0-md5: 50319a4b3818c12c9c7243525e0e6316 -Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: cebfba9a7e91716a06c66bb5b38d9661 +Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run +# Source0-md5: 393260b7e8d8195e982eb718f5014c3d +Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run +# Source1-md5: e634de31c96f7b418ed7fdc385ab049d Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Source4: 10-nvidia.conf @@ -48,9 +49,9 @@ BuildRequires: %{kgcc_package} BuildRequires: rpmbuild(macros) >= 1.379 BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia -Requires: %{pname}-libs = %{epoch}:%{version}-%{release} +Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} Requires: xorg-xserver-server -Requires: xorg-xserver-server(videodrv-abi) <= 11.0 +Requires: xorg-xserver-server(videodrv-abi) <= 13.0 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 Provides: xorg-driver-video Provides: xorg-xserver-module(glx) @@ -58,7 +59,7 @@ Obsoletes: XFree86-driver-nvidia Obsoletes: XFree86-nvidia Conflicts: XFree86-OpenGL-devel <= 4.2.0-3 ExclusiveArch: %{ix86} %{x8664} -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{pname}-%{version}-root-%(id -u -n) %define _noautoreqdep libGL.so.1 @@ -121,7 +122,7 @@ Summary: OpenGL (GL and GLX) header files Summary(hu.UTF-8): OpenGL (GL és GLX) fejléc fájlok Summary(pl.UTF-8): Pliki nagłówkowe OpenGL (GL i GLX) Group: X11/Development/Libraries -Requires: %{pname}-libs = %{epoch}:%{version}-%{release} +Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} Provides: OpenGL-GLX-devel = 1.4 Provides: OpenGL-devel = 2.1 Obsoletes: X11-OpenGL-devel-base @@ -145,7 +146,7 @@ Summary: Static XvMCNVIDIA library Summary(hu.UTF-8): Statikus XwMCNVIDIA könyvtár Summary(pl.UTF-8): Statyczna biblioteka XvMCNVIDIA Group: X11/Development/Libraries -Requires: %{pname}-devel = %{epoch}:%{version}-%{release} +Requires: %{pname}-devel = %{epoch}:%{version}-%{rel} %description static Static XvMCNVIDIA library. @@ -169,7 +170,7 @@ Summary: Tools for advanced control of nVidia graphic cards Summary(hu.UTF-8): Eszközök az nVidia grafikus kártyák beállításához Summary(pl.UTF-8): Narzędzia do zarządzania kartami graficznymi nVidia Group: Applications/System -Requires: %{pname} = %{epoch}:%{version}-%{release} +Requires: %{pname} = %{epoch}:%{version} Suggests: pkgconfig Obsoletes: XFree86-driver-nvidia-progs @@ -187,12 +188,12 @@ Summary: nVidia kernel module for nVidia Architecture support Summary(de.UTF-8): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung Summary(hu.UTF-8): nVidia Architektúra támogatás Linux kernelhez. Summary(pl.UTF-8): Moduł jądra dla obsługi kart graficznych nVidia -Release: %{release}@%{_kernel_ver_str} +Release: %{rel}@%{_kernel_ver_str} Group: Base/Kernel Requires(post,postun): /sbin/depmod Requires: dev >= 2.7.7-10 %{?with_dist_kernel:%requires_releq_kernel} -Requires: %{pname} = %{epoch}:%{version}-%{release} +Requires: %{pname} = %{epoch}:%{version} Provides: X11-driver-nvidia(kernel) Obsoletes: XFree86-nvidia-kernel @@ -276,7 +277,8 @@ install -p libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau install -p libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia ln -s libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so -install -p nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers +install -p nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so.%{version} +ln -s nvidia_drv.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so install -p libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia ln -s libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so @@ -325,8 +327,6 @@ NOTE: You must also install kernel module for this driver to work kernel-video-nvidia-%{version} EOF -# until versioned SONAME is built for nvidia_drv.so, update symlink manually -ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -341,11 +341,13 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so %files %defattr(644,root,root,755) %doc LICENSE NVIDIA_Changelog README.txt +%dir %{_libdir}/xorg/modules/extensions/nvidia %attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.*.* -%attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.1 -%attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so +%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.1 +%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so %attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libglx.so.* -%attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/nvidia/libglx.so +%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libglx.so +%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so.* %attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so %{_sysconfdir}/X11/xorg.conf.d/10-nvidia.conf %{_sysconfdir}/X11/xorg.conf.d/10-nvidia-modules.conf