From 1b003d3a5467f55d5167e6008a807095e7c293b5 Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Tue, 5 Jan 2016 10:33:03 +0100
Subject: [PATCH] remove emacsclient.desktop (#1175969)

emacsclient.desktop listed among other desktop applications is highly
confusing. It doesn't start a new emacs instance as other desktop files.

Resolves: #1175969
---
 emacs.spec          |  6 ++----
 emacsclient.desktop | 12 ------------
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 emacsclient.desktop

diff --git a/emacs.spec b/emacs.spec
index 93dfb69..4e78326 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -11,7 +11,6 @@ URL:           http://www.gnu.org/software/emacs/
 Group:         Applications/Editors
 Source0:       ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz
 Source1:       emacs.desktop
-Source2:       emacsclient.desktop
 Source3:       dotemacs.el
 Source4:       site-start.el
 Source5:       default.el
@@ -327,8 +326,7 @@ install -p -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/skel/.emacs
 mkdir -p %{buildroot}/%{pkgconfig}
 install -p -m 0644 emacs.pc %{buildroot}/%{pkgconfig}
 
-# Install emacsclient desktop file
-install -p -m 0644 %SOURCE2 %{buildroot}/%{_datadir}/applications/emacsclient.desktop
+# Install app data
 mkdir -p %{buildroot}/%{_datadir}/appdata
 cp -a %SOURCE9 %{buildroot}/%{_datadir}/appdata
 
@@ -437,7 +435,6 @@ update-desktop-database &> /dev/null || :
 %{_bindir}/emacs-%{version}
 %attr(0755,-,-) %ghost %{_bindir}/emacs
 %{_datadir}/applications/emacs.desktop
-%{_datadir}/applications/emacsclient.desktop
 %{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/icons/hicolor/*/apps/emacs.png
 #%{_datadir}/icons/hicolor/*/apps/emacs22.png
@@ -482,6 +479,7 @@ update-desktop-database &> /dev/null || :
 %changelog
 * Tue Jan  5 2016 Jan Synáček <jsynacek@redhat.com> - 1:24.5-9
 - set default value for smime-CA-directory (#1131558)
+- remove emacsclient.desktop (#1175969)
 
 * Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:24.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
diff --git a/emacsclient.desktop b/emacsclient.desktop
deleted file mode 100644
index 7e9cc1d..0000000
--- a/emacsclient.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=Emacs Client
-GenericName=Text Editor
-Comment=Edit text
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=emacsclient -c --alternate-editor="" %f
-Icon=emacs
-Type=Application
-Terminal=false
-Categories=Application;Utility;TextEditor;X-Red-Hat-Base;
-Encoding=UTF-8
-StartupWMClass=Emacs