rpms/xorg-x11-drv-nvidia/F-11 xorg-x11-drv-nvidia.spec, 1.33, 1.34 nvidia-settings.desktop, 1.1, NONE

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19042

Modified Files:
	xorg-x11-drv-nvidia.spec 
Removed Files:
	nvidia-settings.desktop 
Log Message:
Remove desktop file



Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xorg-x11-drv-nvidia.spec	24 Nov 2009 21:41:42 -0000	1.33
+++ xorg-x11-drv-nvidia.spec	1 Dec 2009 07:28:08 -0000	1.34
@@ -8,7 +8,7 @@
 
 Name:            xorg-x11-drv-nvidia
 Version:         190.42
-Release:         4%{?dist}
+Release:         5%{?dist}
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards
 
 Group:           User Interface/X Hardware Support
@@ -16,7 +16,6 @@
 URL:             http://www.nvidia.com/
 Source0:         ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run
 Source1:         ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
-Source4:         nvidia-settings.desktop
 Source5:         nvidia-init
 Source6:         blacklist-nouveau.conf
 Source10:        nvidia-config-display
@@ -44,7 +43,6 @@
 Requires(post):  nvidia-kmod >= %{version}
 
 # Needed in all nvidia or fglrx driver packages
-BuildRequires:   desktop-file-utils
 BuildRequires:   prelink
 Requires:        which
 Requires:        livna-config-display >= 0.0.21
@@ -224,11 +222,6 @@
 # X configuration script
 install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-config-display
 
-# Desktop entry for nvidia-settings
-desktop-file-install --vendor livna \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
-    %{SOURCE4}
-
 # Install initscript
 install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia
 
@@ -298,7 +291,6 @@
 %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 %{_libdir}/xorg/modules/extensions/nvidia/*.so*
 #/no_multilib
-%{_datadir}/applications/*nvidia-settings.desktop
 %{_datadir}/pixmaps/*.png
 %exclude %{_mandir}/man1/nvidia-settings.*
 %exclude %{_mandir}/man1/nvidia-xconfig.*
@@ -333,6 +325,9 @@
 
 
 %changelog
+* Fri Nov 27 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 190.42-5
+- Remove duplicate desktop file.
+
 * Tue Nov 24 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 190.42-4
 - Use nvidia-xconfig and nvidia-settings built from sources.
 


--- nvidia-settings.desktop DELETED ---