Hello community, here is the log from the commit of package emacs for openSUSE:Factory checked in at 2013-05-06 10:13:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs (Old) and /work/SRC/openSUSE:Factory/.emacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "emacs" Changes: -------- --- /work/SRC/openSUSE:Factory/emacs/emacs.changes 2013-04-26 12:37:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs.changes 2013-05-06 10:13:18.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Apr 27 10:18:18 UTC 2013 - [email protected] + +- For 13+ add etags subpackage, provide ctags via update-alternatives + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ --- /var/tmp/diff_new_pack.TEkYBB/_old 2013-05-06 10:13:23.000000000 +0200 +++ /var/tmp/diff_new_pack.TEkYBB/_new 2013-05-06 10:13:23.000000000 +0200 @@ -51,6 +51,7 @@ %else BuildRequires: texinfo %endif +BuildRequires: update-alternatives BuildRequires: update-desktop-files BuildRequires: xaw3d-devel BuildRequires: xorg-x11-devel @@ -62,7 +63,11 @@ Url: http://www.gnu.org/software/emacs/ Version: 24.2 Release: 0 +%if 0%{suse_version} >= 1300 +Requires: etags +%else Requires: ctags +%endif Requires: emacs-info = %{version} Requires: emacs_program = %{version}-%{release} Summary: GNU Emacs Base Package @@ -176,6 +181,18 @@ be read online with GNU Emacs. They describe Emacs and some of its modes. +%package -n etags +Summary: Generate Tag Files for Use with Emacs +Group: Development/Tools/Navigators +PreReq: %install_info_prereq +PreReq: update-alternatives +Provides: ctags:/usr/bin/etags + +%description -n 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. + %prep %setup -q -b 2 %patch2 -p0 -b .glibc @@ -485,8 +502,10 @@ rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/startup.el.iconic rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/textmodes/ispell.el.mule rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/term.el.term +%if 0%{suse_version} < 1300 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/ctags.1 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/etags.1 +%endif rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/elc.tar.gz rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/mail/sendmail.el.snd rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/ldefs-boot.el.psbdf @@ -533,8 +552,12 @@ # install desktop file cp etc/images/icons/hicolor/32x32/apps/emacs.png $RPM_SOURCE_DIR/emacs.png %suse_update_desktop_file -i emacs TextEditor +%if 0%{suse_version} >= 1300 +touch %{buildroot}%{_bindir}/ctags %{buildroot}%{_mandir}/man1/ctags.1.gz +%else rm -vf %{buildroot}%{_bindir}/gnuctags rm -vf %{buildroot}%{_mandir}/man1/gnuctags.1* +%endif %post -n emacs-nox test -e usr/bin/emacs || ln -sf emacs-nox usr/bin/emacs @@ -555,6 +578,17 @@ %install_info_delete --info-dir=%{_infodir} %{_infodir}/$f.gz done +%post -n etags +test -L %{_bindir}/ctags || rm -f %{_bindir}/ctags +update-alternatives --install %{_bindir}/ctags ctags %{_bindir}/gnuctags 10 \ + --slave %{_mandir}/man1/ctags.1.gz ctags.1 %{_mandir}/man1/gnuctags.1.gz +update-alternatives --auto ctags + +%preun -n etags +if [ $1 -eq 0 ]; then + update-alternatives --remove ctags %{_bindir}/gnuctags +fi + %files -f site-lisp.lst -n emacs %defattr(-, root, root) /etc/skel/.gnu-emacs @@ -3034,7 +3068,8 @@ %{_datadir}/emacs/%{version}/site-lisp/term/linux.el %{_datadir}/emacs/%{version}/site-lisp/term/locale.el %dir %{_datadir}/emacs/site-lisp/ -%doc %{_mandir}/man1/*.1.gz +%{_mandir}/man1/*.1.gz +%exclude %{_mandir}/man1/*tags.1.gz %dir /var/games/emacs/ /var/games/emacs/snake-scores /var/games/emacs/tetris-scores @@ -4430,4 +4465,16 @@ %{_datadir}/emacs/%{version}/lisp/xml.el.gz %{_datadir}/emacs/%{version}/lisp/xt-mouse.el.gz +%if 0%{suse_version} >= 1300 +%files -n etags +%defattr(-,root,root) +%doc etc/ETAGS.README +%{_bindir}/etags +%{_bindir}/gnuctags +%{_mandir}/man1/etags.1.gz +%{_mandir}/man1/gnuctags.1.gz +%ghost %attr(755,root,root) %{_bindir}/ctags +%ghost %{_mandir}/man1/ctags.1.gz +%endif + %changelog ++++++ emacs-24.1.dif ++++++ --- /var/tmp/diff_new_pack.TEkYBB/_old 2013-05-06 10:13:23.000000000 +0200 +++ /var/tmp/diff_new_pack.TEkYBB/_new 2013-05-06 10:13:23.000000000 +0200 @@ -5,7 +5,7 @@ mandir=@mandir@ man1dir=$(mandir)/man1 -MAN_PAGES=ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \ -+MAN_PAGES=ebrowse.1 emacs.1 emacsclient.1 gnuctags.1 \ ++MAN_PAGES=gnuctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \ grep-changelog.1 rcs-checkin.1 # Where to install and expect the info files describing Emacs. In the @@ -155,18 +155,16 @@ Print usage information. Followed by one or more \-\-language=LANG --- lib-src/Makefile.in +++ lib-src/Makefile.in 2012-06-27 10:41:38.716510300 +0000 -@@ -109,8 +109,8 @@ INSTALL_STRIP = +@@ -109,7 +109,7 @@ INSTALL_STRIP = # ========================== Lists of Files =========================== # Things that a user might actually run, which should be installed in bindir. -INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} \ -- ebrowse${EXEEXT} -+INSTALLABLES = emacsclient${EXEEXT} \ -+ ebrowse${EXEEXT} gnuctags${EXEEXT} ++INSTALLABLES = etags${EXEEXT} gnuctags${EXEEXT} emacsclient${EXEEXT} \ + ebrowse${EXEEXT} INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog - STAMP_INST_SCRIPTS = stamp-rcs-checkin stamp-grep-changelog -@@ -324,10 +324,11 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${ +@@ -324,10 +324,10 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${ ## We depend on etags to assure that parallel makes do not write two ## etags.o files on top of each other. @@ -176,7 +174,6 @@ -DVERSION="\"${version}\"" ${srcdir}/etags.c \ - $(REGEXPOBJ) $(LOADLIBES) -o ctags + $(REGEXPOBJ) $(LOADLIBES) -o gnuctags -+ profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
