Remove desktop file

el9
Nicolas Chauvet 15 years ago
parent e4e8501f1a
commit 4de5076936

@ -1,8 +0,0 @@
[Desktop Entry]
Name=nVidia Display Settings
Comment=Configure the nVidia driver
Exec=nvidia-settings
Terminal=false
Icon=nvidia-settings
Type=Application
Categories=System;

@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia Name: xorg-x11-drv-nvidia
Version: 190.42 Version: 190.42
Release: 4%{?dist} Release: 5%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support Group: User Interface/X Hardware Support
@ -16,7 +16,6 @@ License: Redistributable, no modification permitted
URL: http://www.nvidia.com/ URL: http://www.nvidia.com/
Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run 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 Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
Source4: nvidia-settings.desktop
Source5: nvidia-init Source5: nvidia-init
Source6: blacklist-nouveau.conf Source6: blacklist-nouveau.conf
Source10: nvidia-config-display Source10: nvidia-config-display
@ -44,7 +43,6 @@ Requires: nvidia-kmod >= %{version}
Requires(post): nvidia-kmod >= %{version} Requires(post): nvidia-kmod >= %{version}
# Needed in all nvidia or fglrx driver packages # Needed in all nvidia or fglrx driver packages
BuildRequires: desktop-file-utils
BuildRequires: prelink BuildRequires: prelink
Requires: which Requires: which
Requires: livna-config-display >= 0.0.21 Requires: livna-config-display >= 0.0.21
@ -224,11 +222,6 @@ ln -s libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libvdpau_nvid
# X configuration script # X configuration script
install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-config-display 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 initscript
install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia
@ -298,7 +291,6 @@ fi ||:
%{_libdir}/xorg/modules/drivers/nvidia_drv.so %{_libdir}/xorg/modules/drivers/nvidia_drv.so
%{_libdir}/xorg/modules/extensions/nvidia/*.so* %{_libdir}/xorg/modules/extensions/nvidia/*.so*
#/no_multilib #/no_multilib
%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png %{_datadir}/pixmaps/*.png
%exclude %{_mandir}/man1/nvidia-settings.* %exclude %{_mandir}/man1/nvidia-settings.*
%exclude %{_mandir}/man1/nvidia-xconfig.* %exclude %{_mandir}/man1/nvidia-xconfig.*
@ -333,6 +325,9 @@ fi ||:
%changelog %changelog
* Fri Nov 27 2009 Nicolas Chauvet <kwizart@fedoraproject.org> - 190.42-5
- Remove duplicate desktop file.
* Tue Nov 24 2009 Nicolas Chauvet <kwizart@fedoraproject.org> - 190.42-4 * Tue Nov 24 2009 Nicolas Chauvet <kwizart@fedoraproject.org> - 190.42-4
- Use nvidia-xconfig and nvidia-settings built from sources. - Use nvidia-xconfig and nvidia-settings built from sources.

Loading…
Cancel
Save