rpms/xorg-x11-drv-nvidia-96xx/devel xorg-x11-drv-nvidia-96xx.spec, 1.16, 1.17 nvidia-settings.desktop, 1.3, NONE
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9755
Modified Files:
xorg-x11-drv-nvidia-96xx.spec
Removed Files:
nvidia-settings.desktop
Log Message:
Remove duplicate desktop file
Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file:
/cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel/xorg-x11-drv-nvidia-96xx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-nvidia-96xx.spec 24 Nov 2009 22:56:31 -0000 1.16
+++ xorg-x11-drv-nvidia-96xx.spec 27 Nov 2009 18:16:00 -0000 1.17
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-96xx
Version: 96.43.14
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's 96xx series 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-%...
Source1:
ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
-Source4: nvidia-settings.desktop
Source5: nvidia-96xx-init
Source6: blacklist-nouveau.conf
Source10: nvidia-96xx-config-display
@@ -44,7 +43,6 @@
Requires(post): nvidia-96xx-kmod >= %{version}
# Needed in all nvidia or fglrx driver packages
-BuildRequires: desktop-file-utils
BuildRequires: prelink
Requires: which
Requires: livna-config-display
@@ -196,11 +194,6 @@
# X configuration script
install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-96xx-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-96xx
@@ -265,7 +258,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.*
@@ -288,6 +280,9 @@
%changelog
+* Fri Nov 27 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-3
+- Remove duplicate desktop file
+
* Tue Nov 24 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-2
- Use nvidia-xconfig and nvidia-settings built from sources.
--- nvidia-settings.desktop DELETED ---