[erlang: 5/5] Merge branch 'R14B02' for NVR of erlang-R14B-02.1

[Hans Ulrich Niedermann]

commit f1b58dd8e5d3e1d47a71f7c74ad698d4fa89b021
Merge: 5ca337e c0bbd56
Author: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date:   Mon Mar 21 17:00:11 2011 +0100

    Merge branch 'R14B02' for NVR of erlang-R14B-02.1
    
    * R14B02:
      snmp-4.19 (R14B02) ships lib/snmp/bin/snmpc
      inets-5.5.2 puts *.hrl in include/
      install/symlink *.jar into %{_javadir} (#679031)
      Update to upstream maintenance release R14B02

 erlang.spec                                        |   48 +-
 ...all-info-files-they-are-almost-empty-and-.patch | 1955 --------------------
 otp-0006-Fix-install-dir-typo-for-snmp-man3.patch  |   22 +
 ...all-nteventlog-and-related-doc-files-on-n.patch |    2 +-
 ...-install-.bat-files-on-non-win32-machines.patch |   23 +-
 ...0009-Do-not-install-VxWorks-specific-docs.patch |    2 +-
 otp-0010-Do-not-install-erlang-sources.patch       |   71 +-
 ...h => otp-0012-Remove-rpath-from-esock_ssl.patch |    0
 ...nge-name-field-in-efile_drv.c-as-it-upset.patch |   38 -
 otp-get-patches.sh                                 |    2 +-
 10 files changed, 110 insertions(+), 2053 deletions(-)
---
diff --cc erlang.spec
index 94e3bf8,8033386..037e084
--- a/erlang.spec
+++ b/erlang.spec
@@@ -2290,6 -2308,6 +2308,12 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
++* Mon Mar 21 2011 Hans Ulrich Niedermann <hun at n-dimensional.de> - R14B-02.1
++- snmp-4.19 (R14B02) ships lib/snmp/bin/snmpc
++- inets-5.5.2 puts *.hrl in include/
++- install/symlink *.jar into %%{_javadir} (#679031)
++- Update to upstream maintenance release R14B02
++
  * Sat Feb 12 2011 Hans Ulrich Niedermann <hun at n-dimensional.de> - R14B-01.5
  - erlang-doc does not really require erlang base package (#629723)
  - Add %%{?_isa} for all explicit "Requires:"