From 695c77aafb817ccc5ea03bf9ecef2769b782a7d9 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Mon, 9 Apr 2018 18:31:20 +0200
Subject: [PATCH] Remove any desktop file from the driver

---
 nvidia-settings.desktop  | 12 ------------
 xorg-x11-drv-nvidia.spec |  7 -------
 2 files changed, 19 deletions(-)
 delete mode 100644 nvidia-settings.desktop

diff --git a/nvidia-settings.desktop b/nvidia-settings.desktop
deleted file mode 100644
index 838914b..0000000
--- a/nvidia-settings.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[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
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index c234949..c21cc62 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -50,7 +50,6 @@ Source4:         99-nvidia.conf
 Source5:         00-avoid-glamor.conf
 Source6:         blacklist-nouveau.conf
 Source7:         alternate-install-present
-Source9:         nvidia-settings.desktop
 Source10:        nvidia.conf
 Source11:        60-nvidia.rules
 Source12:        xorg-x11-drv-nvidia.metainfo.xml
@@ -63,7 +62,6 @@ Source21:        nvidia-fallback.service
 
 ExclusiveArch: i686 x86_64 armv7hl
 
-BuildRequires:    desktop-file-utils
 %if 0%{?rhel} > 6 || 0%{?fedora}
 Buildrequires:    systemd
 Requires(post):   systemd
@@ -378,10 +376,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/nvidia
 mkdir -p %{buildroot}%{_datadir}/nvidia-kmod-%{version}
 tar Jcf %{buildroot}%{_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} %{buildroot}%{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
-desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
-
 %if 0%{?fedora} >= 25
 # install AppData and add modalias provides
 mkdir -p %{buildroot}%{_datadir}/appdata/
@@ -494,7 +488,6 @@ fi ||:
 %{_dracut_conf_d}/99-nvidia-dracut.conf
 %endif
 %endif
-%config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
 %{_bindir}/nvidia-bug-report.sh
 # Xorg libs that do not need to be multilib
 %dir %{_nvidia_xorgdir}