rpms/xorg-x11-drv-nvidia/devel nvidia-settings.desktop, 1.4, 1.5 xorg-x11-drv-nvidia.spec, 1.137, 1.138

[Leigh Scott]

Author: leigh123linux

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

Modified Files:
	xorg-x11-drv-nvidia.spec 
Added Files:
	nvidia-settings.desktop 
Log Message:
* Mon Jul 07 2014 Leigh Scott <leigh123linux at googlemail.com> - 1:340.17-2
- add autostart file to load user settings



Index: nvidia-settings.desktop
===================================================================
RCS file: nvidia-settings.desktop
diff -N nvidia-settings.desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nvidia-settings.desktop	7 Jul 2014 13:47:29 -0000	1.5
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Exec=nvidia-settings -l
+Icon=nvidia-settings
+Hidden=false
+NoDisplay=false
+Name[en_GB]=nvidia-settings
+Name=nvidia-settings
+Comment[en_GB]=Load user settings
+Comment=Load user settings
+X-GNOME-Autostart-Delay=30
+X-GNOME-Autostart-enabled=true


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.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- xorg-x11-drv-nvidia.spec	9 Jun 2014 19:15:13 -0000	1.137
+++ xorg-x11-drv-nvidia.spec	7 Jul 2014 13:47:29 -0000	1.138
@@ -8,7 +8,7 @@
 Name:            xorg-x11-drv-nvidia
 Epoch:           1
 Version:         340.17
-Release:         1%{?dist}
+Release:         2%{?dist}
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards
 
 Group:           User Interface/X Hardware Support
@@ -23,6 +23,7 @@
 Source6:         blacklist-nouveau.conf
 Source7:         alternate-install-present
 Source8:         00-ignoreabi.conf
+Source9:         nvidia-settings.desktop
 
 BuildRequires:   desktop-file-utils
 %if 0%{?rhel} > 6 || 0%{?fedora} >= 15
@@ -278,7 +279,10 @@
 
 #Install the nvidia kernel modules sources archive
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/nvidia-kmod-%{version}
-tar Jcf $RPM_BUILD_ROOT%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}-%{_target_cpu}.tar.xz kernel  
+tar Jcf $RPM_BUILD_ROOT%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}-%{_target_cpu}.tar.xz kernel
+
+#Add autostart file for nvidia-settings to load user config
+install -D -p -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
 
 
 %pre
@@ -405,6 +409,7 @@
 %config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf
 %config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf
 %config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf
+%config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
 %if 0%{?rhel} > 6 || 0%{?fedora} >= 15
 %{_unitdir}/nvidia-persistenced.service
 %endif
@@ -480,6 +485,9 @@
 %{_nvidia_libdir}/libnvidia-ml.so
 
 %changelog
+* Mon Jul 07 2014 Leigh Scott <leigh123linux at googlemail.com> - 1:340.17-2
+- add autostart file to load user settings
+
 * Mon Jun 09 2014 Leigh Scott <leigh123linux at googlemail.com> - 1:340.17-1
 - Update to 340.17