- rebuild for kernel-3.5.4-1

[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 9719a1c932e1b323c0a376c51635800369cbad9f..5f405b59761cedd1f68202baaca045031d13d00e 100644 (file)
--- 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 14
+%define                rel 3
 %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.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
@@ -51,7 +51,7 @@ BuildRequires:        sed >= 4.0
 BuildConflicts:        XFree86-nvidia
 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,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
 
@@ -170,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}-%{rel}
+Requires:      %{pname} = %{epoch}:%{version}
 Suggests:      pkgconfig
 Obsoletes:     XFree86-driver-nvidia-progs
 
@@ -193,7 +193,7 @@ Group:              Base/Kernel
 Requires(post,postun): /sbin/depmod
 Requires:      dev >= 2.7.7-10
 %{?with_dist_kernel:%requires_releq_kernel}
-Requires:      %{pname} = %{epoch}:%{version}-%{rel}
+Requires:      %{pname} = %{epoch}:%{version}
 Provides:      X11-driver-nvidia(kernel)
 Obsoletes:     XFree86-nvidia-kernel
 
@@ -277,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
 
@@ -346,6 +347,7 @@ EOF
 %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) %{_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