[erlang/f12/master: 19/19] Merge branch 'f13-emacs-hookup' into f13 (erlang-R13B-04.14)

[Hans Ulrich Niedermann]

commit d1d41c605b5d03975876fb036abb115e2ec5962e
Merge: ba4c39b 4faf855
Author: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date:   Fri Jul 30 16:33:09 2010 +0200

    Merge branch 'f13-emacs-hookup' into f13 (erlang-R13B-04.14)

 erlang.spec |  127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 126 insertions(+), 1 deletions(-)
---
diff --cc erlang.spec
index 5c67c48,a5d47cc..4c191b9
--- a/erlang.spec
+++ b/erlang.spec
@@@ -6,7 -6,7 +6,7 @@@
  
  Name:		erlang
  Version:	%{upstream_ver}
--Release:	%{upstream_rel}.13%{?dist}
++Release:	%{upstream_rel}.14%{?dist}
  Summary:	General-purpose programming language and runtime environment
  
  Group:		Development/Languages
@@@ -1969,8 -2069,30 +2069,33 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/erlang/man/man3/xmerl_xs.*
  %{_libdir}/erlang/man/man3/xmerl_xsd.*
  
+ %files -n emacs-erlang
+ %defattr(-,root,root,-)
+ %dir %{_emacs_sitelispdir}/erlang
+ %doc %{_emacs_sitelispdir}/erlang/README
+ %{_emacs_sitelispdir}/erlang/*.elc
+ %{_emacs_sitestartdir}/erlang-init.el
+ 
+ %files -n emacs-erlang-el
+ %defattr(-,root,root,-)
+ %{_emacs_sitelispdir}/erlang/*.el
+ 
+ %files -n xemacs-erlang
+ %defattr(-,root,root,-)
+ %dir %{_xemacs_sitelispdir}/erlang
+ %doc %{_xemacs_sitelispdir}/erlang/README
+ %{_xemacs_sitelispdir}/erlang/*.elc
+ %{_xemacs_sitestartdir}/erlang-init.el
+ 
+ %files -n xemacs-erlang-el
+ %defattr(-,root,root,-)
+ %{_xemacs_sitelispdir}/erlang/*.el
+ 
  
  %changelog
++* Fri Jul 30 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - R13B-04.14
++- Properly hook up (X)Emacs erlang-mode (#491165)
++
  * Mon Jul 29 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - R13B-04.13
  - Spec file cleanups:
    - Avoid accidental %%rel increments by rpmdev-bumpspec.