Compare commits

...

4 Commits

Author SHA1 Message Date
Karel Klic
fdf853bd40 zmena 2010-09-07 15:23:41 +02:00
Karel Klic
660622ef05 - Rebuild 2010-09-07 15:19:15 +02:00
Karel Klic
eb4418faa0 Removed the png extension from the Icon entry in emacs.desktop (rhbz#507231) 2010-09-06 14:17:09 +02:00
Karel Klic
91094b90bb New subpackage emacs-terminal, rhbz#617355 2010-08-03 17:24:41 +02:00
2 changed files with 35 additions and 8 deletions

View File

@ -5,7 +5,7 @@ Comment=Edit text
Comment[zh_TW]=
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=emacs %f
Icon=emacs.png
Icon=emacs
Type=Application
Terminal=false
Categories=Application;Utility;TextEditor;X-Red-Hat-Base;

View File

@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
Name: emacs
Epoch: 1
Version: 23.2
Release: 7%{?dist}
Release: 11%{?dist}
License: GPLv3+
URL: http://www.gnu.org/software/emacs/
Group: Applications/Editors
@ -20,7 +20,7 @@ Source10: rpm-spec-mode.el
Source11: rpm-spec-mode-init.el
Source13: focus-init.el
Source18: default.el
# Emacs Terminal Mode, #551949
# Emacs Terminal Mode, #551949, #617355
Source19: emacs-terminal.desktop
Source20: emacs-terminal.sh
Patch0: glibc-open-macro.patch
@ -54,8 +54,6 @@ Requires: hunspell, aspell
BuildRequires: librsvg2-devel, m17n-lib-devel, libotf-devel
BuildRequires: alsa-lib-devel
# Desktop integration
BuildRequires: desktop-file-utils
Requires: desktop-file-utils
Conflicts: gettext < 0.10.40
Provides: emacs(bin) = %{epoch}:%{version}-%{release}
@ -130,6 +128,18 @@ programs included with the main Emacs text editor package.
You need to install emacs-el only if you intend to modify any of the
Emacs packages or see some elisp examples.
%package terminal
Summary: A desktop menu item for GNU Emacs terminal.
Group: Applications/Editors
%description terminal
Contains a desktop menu item running GNU Emacs terminal. Install
emacs-terminal if you need a terminal with Malayalam support.
Please note that emacs-terminal is a temporary package and it will be
removed when anther terminal becomes capable of handling Malayalam.
%define emacs_libexecdir %{_libexecdir}/emacs/%{version}/%{_host}
%prep
@ -364,21 +374,24 @@ fi
alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
--slave %{_mandir}/man1/etags.1.gz emacs.etags.man %{_mandir}/man1/etags.emacs.1.gz
%post terminal
update-desktop-database &> /dev/null || :
%postun terminal
update-desktop-database &> /dev/null || :
%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
%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg
%files nox
%defattr(-,root,root)
%{_bindir}/emacs-%{version}-nox
@ -411,7 +424,21 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
%dir %{_datadir}/emacs
%dir %{_datadir}/emacs/%{version}
%files terminal
%defattr(-,root,root)
%{_bindir}/emacs-terminal
%{_datadir}/applications/emacs-terminal.desktop
%changelog
* Mon Sep 7 2010 Karel Klic <kklic@redhat.com> - 1:23.2-10
- Rebuild
* Mon Aug 16 2010 Karel Klic <kklic@redhat.com> - 1:23.2-9
- Removed the png extension from the Icon entry in emacs.desktop (rhbz#507231)
* Mon Aug 2 2010 Karel Klic <kklic@redhat.com> - 1:23.2-8
- Moved the terminal desktop menu item to a separate package (rhbz#617355)
* Thu Jul 8 2010 Karel Klic <kklic@redhat.com> - 1:23.2-7
- Added workaround for an GCC 4.5.0 bug