From 0134b8d40fd7d599f1f5645caf18e1de8aab852f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Kl=C3=AD=C4=8D?= Date: Thu, 20 May 2010 12:43:35 +0000 Subject: [PATCH] Add emacs terminal mode to desktop menu --- emacs-terminal.desktop | 11 +++++++++++ emacs-terminal.sh | 3 +++ emacs.spec | 17 +++++++++++++++-- 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 emacs-terminal.desktop create mode 100644 emacs-terminal.sh diff --git a/emacs-terminal.desktop b/emacs-terminal.desktop new file mode 100644 index 0000000..3c12470 --- /dev/null +++ b/emacs-terminal.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Emacs Terminal +GenericName=Emacs Terminal +Comment=Emacs Terminal Mode +Exec=emacs-terminal +Icon=utilities-terminal +Type=Application +Terminal=false +Categories=Application;Utility;X-Red-Hat-Base;GTK;TerminalEmulator; +Encoding=UTF-8 +StartupWMClass=Emacs diff --git a/emacs-terminal.sh b/emacs-terminal.sh new file mode 100644 index 0000000..caa84cc --- /dev/null +++ b/emacs-terminal.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +exec emacs -Q --eval '(ansi-term "/bin/bash")' diff --git a/emacs.spec b/emacs.spec index 5b818cd..0c146ce 100644 --- a/emacs.spec +++ b/emacs.spec @@ -4,7 +4,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 23.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -20,6 +20,9 @@ Source10: rpm-spec-mode.el Source11: rpm-spec-mode-init.el Source13: focus-init.el Source18: default.el +# Emacs Terminal Mode, #551949 +Source19: emacs-terminal.desktop +Source20: emacs-terminal.sh Patch0: glibc-open-macro.patch Patch1: rpm-spec-mode.patch Patch3: rpm-spec-mode-utc.patch @@ -269,14 +272,19 @@ install -p -m 0644 emacs.pc %{buildroot}/%{pkgconfig} mkdir -p %{buildroot}%{_sysconfdir}/rpm install -p -m 0644 macros.emacs %{buildroot}%{_sysconfdir}/rpm/ +# installing emacs-terminal binary +install -p -m 755 %SOURCE20 %{buildroot}%{_bindir}/emacs-terminal + # after everything is installed, remove info dir rm -f %{buildroot}%{_infodir}/dir rm %{buildroot}%{_localstatedir}/games/emacs/* -# install desktop file +# install desktop files mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install --dir=%{buildroot}%{_datadir}/applications \ %SOURCE1 +desktop-file-install --dir=%{buildroot}%{_datadir}/applications \ + %SOURCE19 # Byte compile emacs*.py with correct python interpreters %py_byte_compile %{__python} %{buildroot}%{_datadir}/%{name}/%{version}/etc/emacs.py @@ -351,10 +359,12 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \ %files %defattr(-,root,root) %{_bindir}/emacs-%{version} +%{_bindir}/emacs-terminal %dir %{_libexecdir}/emacs %dir %{_libexecdir}/emacs/%{version} %dir %{emacs_libexecdir} %{_datadir}/applications/emacs.desktop +%{_datadir}/applications/emacs-terminal.desktop %{_datadir}/icons/hicolor/*/apps/emacs.png %{_datadir}/icons/hicolor/*/apps/emacs22.png %{_datadir}/icons/hicolor/scalable/apps/emacs.svg @@ -392,6 +402,9 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \ %dir %{_datadir}/emacs/%{version} %changelog +* Wed May 19 2010 Naveen Kumar - 1:23.2-3 +- Added a desktop file for adding terminal mode to menu (RHBZ #551949) + * Tue May 11 2010 Karel Klic - 1:23.2-2 - Added a patch fixing m17n and libotf version checking (m17ncheck)