Compare commits
4 Commits
Author | SHA1 | Date |
---|---|---|
|
5c25ce899b | |
|
343fa7ae3b | |
|
eb4418faa0 | |
|
91094b90bb |
|
@ -5,7 +5,7 @@ Comment=Edit text
|
||||||
Comment[zh_TW]=編輯文字
|
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++;
|
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
|
Exec=emacs %f
|
||||||
Icon=emacs.png
|
Icon=emacs
|
||||||
Type=Application
|
Type=Application
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Categories=Application;Utility;TextEditor;X-Red-Hat-Base;
|
Categories=Application;Utility;TextEditor;X-Red-Hat-Base;
|
||||||
|
|
73
emacs.spec
73
emacs.spec
|
@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
|
||||||
Name: emacs
|
Name: emacs
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 23.2
|
Version: 23.2
|
||||||
Release: 7%{?dist}
|
Release: 11%{?dist}
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
URL: http://www.gnu.org/software/emacs/
|
URL: http://www.gnu.org/software/emacs/
|
||||||
Group: Applications/Editors
|
Group: Applications/Editors
|
||||||
|
@ -20,7 +20,7 @@ Source10: rpm-spec-mode.el
|
||||||
Source11: rpm-spec-mode-init.el
|
Source11: rpm-spec-mode-init.el
|
||||||
Source13: focus-init.el
|
Source13: focus-init.el
|
||||||
Source18: default.el
|
Source18: default.el
|
||||||
# Emacs Terminal Mode, #551949
|
# Emacs Terminal Mode, #551949, #617355
|
||||||
Source19: emacs-terminal.desktop
|
Source19: emacs-terminal.desktop
|
||||||
Source20: emacs-terminal.sh
|
Source20: emacs-terminal.sh
|
||||||
Patch0: glibc-open-macro.patch
|
Patch0: glibc-open-macro.patch
|
||||||
|
@ -57,6 +57,8 @@ BuildRequires: alsa-lib-devel
|
||||||
# Desktop integration
|
# Desktop integration
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
Requires: desktop-file-utils
|
Requires: desktop-file-utils
|
||||||
|
Requires(preun): %{_sbindir}/alternatives
|
||||||
|
Requires(posttrans): %{_sbindir}/alternatives
|
||||||
Conflicts: gettext < 0.10.40
|
Conflicts: gettext < 0.10.40
|
||||||
Provides: emacs(bin) = %{epoch}:%{version}-%{release}
|
Provides: emacs(bin) = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
|
@ -92,6 +94,8 @@ This package provides an emacs binary with support for X windows.
|
||||||
%package nox
|
%package nox
|
||||||
Summary: GNU Emacs text editor without X support
|
Summary: GNU Emacs text editor without X support
|
||||||
Group: Applications/Editors
|
Group: Applications/Editors
|
||||||
|
Requires(preun): %{_sbindir}/alternatives
|
||||||
|
Requires(posttrans): %{_sbindir}/alternatives
|
||||||
Requires: emacs-common = %{epoch}:%{version}-%{release}
|
Requires: emacs-common = %{epoch}:%{version}-%{release}
|
||||||
Provides: emacs(bin) = %{epoch}:%{version}-%{release}
|
Provides: emacs(bin) = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
|
@ -130,6 +134,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
|
You need to install emacs-el only if you intend to modify any of the
|
||||||
Emacs packages or see some elisp examples.
|
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}
|
%define emacs_libexecdir %{_libexecdir}/emacs/%{version}/%{_host}
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
|
@ -240,6 +256,7 @@ cd ..
|
||||||
|
|
||||||
# let alternatives manage the symlink
|
# let alternatives manage the symlink
|
||||||
rm %{buildroot}%{_bindir}/emacs
|
rm %{buildroot}%{_bindir}/emacs
|
||||||
|
touch %{buildroot}%{_bindir}/emacs
|
||||||
|
|
||||||
# do not compress the files which implement compression itself (#484830)
|
# do not compress the files which implement compression itself (#484830)
|
||||||
gunzip %{buildroot}%{_datadir}/emacs/%{version}/lisp/jka-compr.el.gz
|
gunzip %{buildroot}%{_datadir}/emacs/%{version}/lisp/jka-compr.el.gz
|
||||||
|
@ -336,16 +353,16 @@ if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
alternatives --remove emacs %{_bindir}/emacs-%{version} || :
|
%{_sbindir}/alternatives --remove emacs %{_bindir}/emacs-%{version}
|
||||||
|
|
||||||
%posttrans
|
%posttrans
|
||||||
alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version} 80 || :
|
%{_sbindir}/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version} 80
|
||||||
|
|
||||||
%preun nox
|
%preun nox
|
||||||
alternatives --remove emacs %{_bindir}/emacs-%{version}-nox || :
|
%{_sbindir}/alternatives --remove emacs %{_bindir}/emacs-%{version}-nox
|
||||||
|
|
||||||
%posttrans nox
|
%posttrans nox
|
||||||
alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-nox 70 || :
|
%{_sbindir}/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-nox 70
|
||||||
|
|
||||||
%post common
|
%post common
|
||||||
for f in %{info_files}; do
|
for f in %{info_files}; do
|
||||||
|
@ -353,7 +370,7 @@ for f in %{info_files}; do
|
||||||
done
|
done
|
||||||
|
|
||||||
%preun common
|
%preun common
|
||||||
alternatives --remove emacs.etags %{_bindir}/etags.emacs || :
|
%{_sbindir}/alternatives --remove emacs.etags %{_bindir}/etags.emacs
|
||||||
if [ "$1" = 0 ]; then
|
if [ "$1" = 0 ]; then
|
||||||
for f in %{info_files}; do
|
for f in %{info_files}; do
|
||||||
/sbin/install-info --delete %{_infodir}/$f %{_infodir}/dir 2> /dev/null || :
|
/sbin/install-info --delete %{_infodir}/$f %{_infodir}/dir 2> /dev/null || :
|
||||||
|
@ -361,27 +378,32 @@ if [ "$1" = 0 ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%posttrans common
|
%posttrans common
|
||||||
alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
|
%{_sbindir}/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
|
--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
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_bindir}/emacs-%{version}
|
%{_bindir}/emacs-%{version}
|
||||||
%{_bindir}/emacs-terminal
|
%attr(0755,-,-) %ghost %{_bindir}/emacs
|
||||||
%dir %{_libexecdir}/emacs
|
%dir %{_libexecdir}/emacs
|
||||||
%dir %{_libexecdir}/emacs/%{version}
|
%dir %{_libexecdir}/emacs/%{version}
|
||||||
%dir %{emacs_libexecdir}
|
%dir %{emacs_libexecdir}
|
||||||
%{_datadir}/applications/emacs.desktop
|
%{_datadir}/applications/emacs.desktop
|
||||||
%{_datadir}/applications/emacs-terminal.desktop
|
|
||||||
%{_datadir}/icons/hicolor/*/apps/emacs.png
|
%{_datadir}/icons/hicolor/*/apps/emacs.png
|
||||||
%{_datadir}/icons/hicolor/*/apps/emacs22.png
|
%{_datadir}/icons/hicolor/*/apps/emacs22.png
|
||||||
%{_datadir}/icons/hicolor/scalable/apps/emacs.svg
|
%{_datadir}/icons/hicolor/scalable/apps/emacs.svg
|
||||||
%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg
|
%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg
|
||||||
|
|
||||||
|
|
||||||
%files nox
|
%files nox
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_bindir}/emacs-%{version}-nox
|
%{_bindir}/emacs-%{version}-nox
|
||||||
|
%attr(0755,-,-) %ghost %{_bindir}/emacs
|
||||||
%dir %{_libexecdir}/emacs
|
%dir %{_libexecdir}/emacs
|
||||||
%dir %{_libexecdir}/emacs/%{version}
|
%dir %{_libexecdir}/emacs/%{version}
|
||||||
%dir %{emacs_libexecdir}
|
%dir %{emacs_libexecdir}
|
||||||
|
@ -391,8 +413,13 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
|
||||||
%config(noreplace) %{_sysconfdir}/skel/.emacs
|
%config(noreplace) %{_sysconfdir}/skel/.emacs
|
||||||
%config(noreplace) %{_sysconfdir}/rpm/macros.emacs
|
%config(noreplace) %{_sysconfdir}/rpm/macros.emacs
|
||||||
%doc etc/NEWS BUGS README etc/COPYING
|
%doc etc/NEWS BUGS README etc/COPYING
|
||||||
%exclude %{_bindir}/emacs-*
|
%{_bindir}/b2m
|
||||||
%{_bindir}/*
|
%{_bindir}/ebrowse
|
||||||
|
%{_bindir}/emacsclient
|
||||||
|
%{_bindir}/etags.emacs
|
||||||
|
%{_bindir}/gctags
|
||||||
|
%{_bindir}/grep-changelog
|
||||||
|
%{_bindir}/rcs-checkin
|
||||||
%{_mandir}/*/*
|
%{_mandir}/*/*
|
||||||
%{_infodir}/*
|
%{_infodir}/*
|
||||||
%dir %{_datadir}/emacs
|
%dir %{_datadir}/emacs
|
||||||
|
@ -411,7 +438,27 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
|
||||||
%dir %{_datadir}/emacs
|
%dir %{_datadir}/emacs
|
||||||
%dir %{_datadir}/emacs/%{version}
|
%dir %{_datadir}/emacs/%{version}
|
||||||
|
|
||||||
|
%files terminal
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%{_bindir}/emacs-terminal
|
||||||
|
%{_datadir}/applications/emacs-terminal.desktop
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 26 2011 Karel Klíč <kklic@redhat.com> - 1:23.2-11
|
||||||
|
- Do not include /usr/bin/emacs in emacs-common
|
||||||
|
|
||||||
|
* Mon May 23 2011 Karel Klíč <kklic@redhat.com> - 1:23.2-10
|
||||||
|
- Fix the handling of alternatives
|
||||||
|
The current process loses alternatives preference on every upgrade,
|
||||||
|
but there seems to be no elegant way how to prevent this while
|
||||||
|
having versioned binaries (/bin/emacs-%%{version}) at the same time.
|
||||||
|
|
||||||
|
* 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
|
* Thu Jul 8 2010 Karel Klic <kklic@redhat.com> - 1:23.2-7
|
||||||
- Added workaround for an GCC 4.5.0 bug
|
- Added workaround for an GCC 4.5.0 bug
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue