[xorg-x11-drv-nvidia-340xx/el6] Fixup el6 desktop validation
commit ae484a43c9aaef4f9dffe1451c31c2a1a1328dc2
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon May 18 13:43:58 2020 +0200
Fixup el6 desktop validation
xorg-x11-drv-nvidia-340xx.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia-340xx.spec b/xorg-x11-drv-nvidia-340xx.spec
index cf2ff9d..10a48ac 100644
--- a/xorg-x11-drv-nvidia-340xx.spec
+++ b/xorg-x11-drv-nvidia-340xx.spec
@@ -251,13 +251,16 @@ touch -r %{SOURCE2}
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
# Desktop entry for nvidia-settings
+%if 0%{?el6}
+sed -i -e 's|__PIXMAP_PATH__/||' nvidia-settings.desktop
+%endif
desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
--set-icon=nvidia-settings \
--set-key=Exec --set-value=nvidia-settings \
%endif
- nvidia-settings.desktop || :
+ nvidia-settings.desktop
#Workaround for self made xorg.conf using a Files section.
ln -fs ../../%{_nvidia_serie}/xorg
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}