[erlang/f14/master: 2/3] Merge branch 'f14-emacs-hookup' into f14 (erlang-R14A-0.5)

[Hans Ulrich Niedermann]

commit 6258c944678f88333189b2b15c4bddf5f6d72ca5
Merge: 617ef6f 602bb48
Author: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date:   Fri Jul 30 19:32:27 2010 +0200

    Merge branch 'f14-emacs-hookup' into f14 (erlang-R14A-0.5)

 erlang.spec |  127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 126 insertions(+), 1 deletions(-)
---
diff --cc erlang.spec
index 50718cb,2a9618c..a520b0a
--- a/erlang.spec
+++ b/erlang.spec
@@@ -6,7 -6,7 +6,7 @@@
  
  Name:		erlang
  Version:	%{upstream_ver}
--Release:	%{upstream_rel}.4%{?dist}
++Release:	%{upstream_rel}.5%{?dist}
  Summary:	General-purpose programming language and runtime environment
  
  Group:		Development/Languages
@@@ -1947,8 -2047,30 +2047,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> - R14A-0.5
++- Properly hook up (X)Emacs erlang-mode (#491165)
++
  * Mon Jul 26 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - R14A-0.4
  - Spec file cleanups:
    - Avoid accidental %%rel increments by rpmdev-bumpspec.