diff --git a/emacs.changes b/emacs.changes index c4bfabe..6fbe0c4 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 21 14:38:23 UTC 2013 - werner@suse.de + +- Do not install etags below OS 13.0 (bnc#820567) +- Use UTF-8 even in changelog for old entries + ------------------------------------------------------------------- Sat Apr 27 10:18:18 UTC 2013 - schwab@linux-m68k.org @@ -1684,11 +1690,11 @@ Sat May 24 22:21:00 MET DST 1997 - werner@suse.de ---------------------------------------------------------------------------- Tue Feb 4 16:20:39 MET 1997 - werner@suse.de - Update auf gefixte Version 19.34b - - Drucken sollte jetzt möglich sein - - Aufräumen von term/linux.el und term/xterm.el + - Drucken sollte jetzt möglich sein + - Aufräumen von term/linux.el und term/xterm.el ---------------------------------------------------------------------------- Thu Aug 29 00:00:00 MET 1996 - werner@suse.de - Neue Version von GNU Emacs: 19.34 - Anpassungen an TERM=linux, TERM=xterm - - Delete löscht Zeichen unter dem Cursor + - Delete löscht Zeichen unter dem Cursor diff --git a/emacs.spec b/emacs.spec index 2066bd9..efbb2c8 100644 --- a/emacs.spec +++ b/emacs.spec @@ -181,6 +181,7 @@ This package contains all the Info files for GNU Emacs. These files can be read online with GNU Emacs. They describe Emacs and some of its modes. +%if 0%{suse_version} >= 1300 %package -n etags Summary: Generate Tag Files for Use with Emacs Group: Development/Tools/Navigators @@ -192,6 +193,7 @@ Provides: ctags:/usr/bin/etags ETags generates tag files from source code in Pascal, Cobol, Ada, Perl, LaTeX, Scheme, Emacs Lisp/Common Lisp, Postscript, Erlang, Python, Prolog, and most assembler-like syntaxes. +%endif %prep %setup -q -b 2 @@ -555,6 +557,7 @@ cp etc/images/icons/hicolor/32x32/apps/emacs.png $RPM_SOURCE_DIR/emacs.png %if 0%{suse_version} >= 1300 touch %{buildroot}%{_bindir}/ctags %{buildroot}%{_mandir}/man1/ctags.1.gz %else +rm -vf %{buildroot}%{_bindir}/etags rm -vf %{buildroot}%{_bindir}/gnuctags rm -vf %{buildroot}%{_mandir}/man1/gnuctags.1* %endif @@ -578,6 +581,7 @@ for f in %info_files; do %install_info_delete --info-dir=%{_infodir} %{_infodir}/$f.gz done +%if 0%{suse_version} >= 1300 %post -n etags test -L %{_bindir}/ctags || rm -f %{_bindir}/ctags update-alternatives --install %{_bindir}/ctags ctags %{_bindir}/gnuctags 10 \ @@ -588,6 +592,7 @@ update-alternatives --auto ctags if [ $1 -eq 0 ]; then update-alternatives --remove ctags %{_bindir}/gnuctags fi +%endif %files -f site-lisp.lst -n emacs %defattr(-, root, root)