X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=79b428b5d57d48483a9c7b7144e1098b20be578e;hp=53f07e32439066a57d04f66ba02045fc7066dced;hb=e751e3804f63458d9ea5371fe48b8afa06b1f35f;hpb=34803a3f87d968617afa9cc93673d431adece037 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 53f07e3..79b428b 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -20,21 +20,21 @@ %endif %define no_install_post_check_so 1 -%define rel 8 +%define rel 5 %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 +Name: %{pname}%{_alt_kernel} +Version: 304.64 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: 6964415cf648a5f4f38117b168369de2 +Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run +# Source1-md5: 76007ed4b72afd334e26377b646f5f7e Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Source4: 10-nvidia.conf @@ -49,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) @@ -59,10 +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) - -# constify %rel macro, so it wouldn't expand in kernel subpkgs -%{expand:%%global rel %{release}} +BuildRoot: %{tmpdir}/%{pname}-%{version}-root-%(id -u -n) %define _noautoreqdep libGL.so.1 @@ -125,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 @@ -149,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. @@ -173,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 @@ -191,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 @@ -280,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 @@ -343,11 +341,13 @@ EOF %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