rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.118,1.119

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1754/devel

Modified Files:
	xorg-x11-drv-nvidia.spec 
Log Message:
Sync with devel



Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- xorg-x11-drv-nvidia.spec	29 Sep 2013 23:25:10 -0000	1.118
+++ xorg-x11-drv-nvidia.spec	2 Oct 2013 15:53:31 -0000	1.119
@@ -8,7 +8,7 @@
 Name:            xorg-x11-drv-nvidia
 Epoch:           1
 Version:         325.15
-Release:         1%{?dist}
+Release:         2%{?dist}
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards
 
 Group:           User Interface/X Hardware Support
@@ -223,8 +223,10 @@
 # Desktop entry for nvidia-settings
 desktop-file-install --vendor "" \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
+%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
     --set-icon=nvidia-settings \
     --set-key=Exec --set-value=nvidia-settings \
+%endif
     nvidia-settings.desktop
 
 #Workaround for self made xorg.conf using a Files section.
@@ -406,13 +408,13 @@
 
 %files devel
 %defattr(-,root,root,-)
-%exclude %{_nvidia_libdir}/libcuda.so
 %{_includedir}/nvidia/
 %ifarch x86_64 i686
 %{_nvidia_libdir}/libOpenCL.so
 %{_nvidia_libdir}/libnvidia-compiler.so
 %{_nvidia_libdir}/libnvidia-encode.so
 %endif
+%{_nvidia_libdir}/libcuda.so
 %{_nvidia_libdir}/libGL.so
 %{_nvidia_libdir}/libnvidia-glcore.so
 %{_nvidia_libdir}/libnvidia-ifr.so
@@ -422,6 +424,10 @@
 %{_nvidia_libdir}/libnvidia-vgxcfg.so
 
 %changelog
+* Wed Oct 02 2013 Nicolas Chauvet <kwizart at gmail.com> - 1:325.15-2
+- Avoid to exclude libcuda.so in devel
+- Drop desktop-file-install options not supported on EL6
+
 * Tue Aug 06 2013 Leigh Scott <leigh123linux at googlemail.com> - 1:325.15-1
 - Update to 325.15 release