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=6e8252a25111e39dbde609c3074f70d06372230e;hp=c705427131961f15ff302535fecf5ae882077b18;hb=8721668e0f6dc0e885ce77add8807861266b79fc;hpb=454709e3479bd48eb6c7dfa84d3a9071dc4eede7

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index c705427..6e8252a 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -24,22 +24,21 @@
 %endif
 %define		no_install_post_check_so 1
 
-%define		pname		xorg-driver-video-nvidia
-%define		rel		7%{?with_multigl:.mgl}
-
+%define		rel		9%{?with_multigl:.mgl}
+%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:	270.41.06
+Version:	285.05.09
 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:	702868c77b13bba46f0fce26ed7a1fb7
+# Source0-md5:	2d469a90abef50320f548cfa8085e3a0
 Source1:	http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5:	d62243b91d0dc8f2c4b2ab646b72ca65
+# Source1-md5:	2f4a0e78f5560c07220b7ed6fc1e27aa
 Source2:	%{pname}-xinitrc.sh
 Source3:	gl.pc.in
 Patch0:		X11-driver-nvidia-GL.patch
@@ -54,8 +53,9 @@ BuildRequires:	sed >= 4.0
 BuildConflicts:	XFree86-nvidia
 Requires:	%{pname}-libs = %{epoch}:%{version}-%{rel}
 Requires:	xorg-xserver-server
-Requires:	xorg-xserver-server(videodrv-abi) <= 10.0
+Requires:	xorg-xserver-server(videodrv-abi) <= 11.0
 Requires:	xorg-xserver-server(videodrv-abi) >= 2.0
+Provides:	xorg-driver-video
 Provides:	xorg-xserver-module(glx)
 Obsoletes:	XFree86-driver-nvidia
 Obsoletes:	XFree86-nvidia
@@ -252,18 +252,18 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \
 	$RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir}/vdpau,%{_bindir},%{_mandir}/man1} \
 	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d} \
-	$RPM_BUILD_ROOT/etc/OpenCL/vendors
+	$RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors
 
 %if %{with multigl}
 install -d $RPM_BUILD_ROOT{%{_libdir}/nvidia,%{_sysconfdir}/ld.so.conf.d}
 %endif
 
 install -p nvidia-{settings,smi,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir}
-cp -a nvidia-{settings,smi,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1
-cp -a nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir}
-cp -a nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -p nvidia-{settings,smi,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir}
+cp -p nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh
-install -p nvidia.icd $RPM_BUILD_ROOT/etc/OpenCL/vendors
+install -p nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors
 
 %if %{without multigl}
 install -p libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}
@@ -349,14 +349,15 @@ 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
 %if %{with multigl}
 if [ ! -e %{_libdir}/xorg/modules/extensions/libglx.so ]; then
+	/sbin/ldconfig -N %{_libdir}/xorg/modules/extensions
 	ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so
 fi
 %else
 /sbin/ldconfig -N %{_libdir}/xorg/modules/extensions
-# 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
 ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so
 %endif
 
@@ -386,9 +387,9 @@ ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so
 
 %files libs
 %defattr(644,root,root,755)
-%dir /etc/OpenCL
-%dir /etc/OpenCL/vendors
-/etc/OpenCL/vendors/nvidia.icd
+%dir %{_sysconfdir}/OpenCL
+%dir %{_sysconfdir}/OpenCL/vendors
+%{_sysconfdir}/OpenCL/vendors/nvidia.icd
 %if %{with multigl}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia.conf
 %dir %{_libdir}/nvidia