Ver. R15B

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2012-02-07 18:42:57 +04:00 · 2012-02-07 18:42:57 +04:00 · 5d2c8835ef
commit 5d2c8835ef
parent 1b75fa0c10
13 changed files with 206 additions and 370 deletions
--- a/.gitignore
+++ b/.gitignore
@ -14,3 +14,6 @@ otp_src_R14A.tar.gz
 /otp_src_R14B04.tar.gz
 /otp_doc_html_R14B04.tar.gz
 /otp_doc_man_R14B04.tar.gz
+/otp_doc_html_R15B.tar.gz
+/otp_doc_man_R15B.tar.gz
+/otp_src_R15B.tar.gz
--- a/erlang.spec
+++ b/erlang.spec
@ -1,7 +1,7 @@
-%global upstream_ver R14B
+%global upstream_ver R15B
 # Do NOT change %%{upstream_rel} unless UPSTREAM has actually changed it!
-%global upstream_rel 04
-#global upstream_rel %{nil}
+#%global upstream_rel 01
+%global upstream_rel %{nil}
 # Use %%{nil} for %%{upstream_rel} for tracking source like otp_src_R14B.tar.gz,
 # and 01 %%{upstream_rel} for tracking source like otp_src_R14B01.tar.gz.

@ -15,7 +15,7 @@

 # Change this back to include all Fedora versions (not just those <
 # 15) when the fop package has been fixed on fc15 (bug 689930).
-%if 0%{?el5}%{?el6}%{?fc15}
+%if 0%{?el5}%{?el6}%{?fc15}%{?fc17}
 %define use_prebuilt_docs 1
 %else
 %define use_prebuilt_docs 0
@ -25,7 +25,7 @@

 Name:		erlang
 Version:	%{upstream_ver}
-Release:	%{upstream_rel_for_rpm}.1%{?dist}.1
+Release:	%{upstream_rel_for_rpm}.1%{?dist}
 Summary:	General-purpose programming language and runtime environment

 Group:		Development/Languages
@ -61,29 +61,23 @@ Patch1: otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
 #   Remove rpath
 Patch2: otp-0002-Remove-rpath.patch
 # Fedora specific patch
-#   Fix for dlopening libGL and libGLU
-Patch3: otp-0003-Fix-for-dlopening-libGL-and-libGLU.patch
-# Fedora specific patch
 #   Do not install C sources
-Patch4: otp-0004-Do-not-install-C-sources.patch
+Patch3: otp-0003-Do-not-install-C-sources.patch
 # Fedora specific patch
 #   Do not install Java sources
-Patch5: otp-0005-Do-not-install-Java-sources.patch
+Patch4: otp-0004-Do-not-install-Java-sources.patch
 # Fedora specific patch
 #   Do not install nteventlog and related doc-files on non-win32
-Patch6: otp-0006-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
+Patch5: otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
 # Fedora specific patch
 #   Do not install VxWorks-specific docs
-Patch7: otp-0007-Do-not-install-VxWorks-specific-docs.patch
+Patch6: otp-0006-Do-not-install-VxWorks-specific-docs.patch
 # Fedora specific patch
 #   Do not install erlang sources
-Patch8: otp-0008-Do-not-install-erlang-sources.patch
+Patch7: otp-0007-Do-not-install-erlang-sources.patch
 # Required only for el5, el6 on PowerPC
 #   Ugly workaround for java-1.5.0-gcj which doesn't support
-Patch9: otp-0009-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch
-# Fedora specific patch
-#   Remove rpath from esock_ssl
-Patch10: otp-0010-Remove-rpath-from-esock_ssl.patch
+Patch8: otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch
 # end of autogenerated patch tag list

 # BuildRoot not strictly needed since F10, but keep it for spec file robustness
@ -126,7 +120,6 @@ Requires: erlang-crypto%{?_isa} = %{version}-%{release}
 Requires: erlang-debugger%{?_isa} = %{version}-%{release}
 Requires: erlang-dialyzer%{?_isa} = %{version}-%{release}
 Requires: erlang-diameter%{?_isa} = %{version}-%{release}
-Requires: erlang-docbuilder%{?_isa} = %{version}-%{release}
 Requires: erlang-edoc%{?_isa} = %{version}-%{release}
 Requires: erlang-erl_docgen%{?_isa} = %{version}-%{release}
 Requires: erlang-erl_interface%{?_isa} = %{version}-%{release}
@ -168,6 +161,7 @@ Requires: erlang-typer%{?_isa} = %{version}-%{release}
 Requires: erlang-webtool%{?_isa} = %{version}-%{release}
 Requires: erlang-wx%{?_isa} = %{version}-%{release}
 Requires: erlang-xmerl%{?_isa} = %{version}-%{release}
+Obsoletes: erlang-docbuilder

 %description
 Erlang is a general-purpose programming language and runtime
@ -398,19 +392,6 @@ Obsoletes:	%{name}-doc < R13B-04.4
 %description doc
 Documentation for Erlang.

-%package docbuilder
-Summary:	Tool for generating HTML documentation for applications
-Group:		Development/Languages
-Requires: %{name}-edoc%{?_isa} = %{version}-%{release}
-Requires: %{name}-erts%{?_isa} = %{version}-%{release}
-Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
-Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
-Requires: %{name}-xmerl%{?_isa} = %{version}-%{release}
-Obsoletes:	%{name} < R13B-04.5
-
-%description docbuilder
-Tool for generating HTML documentation for applications.
-
 %package edoc
 Summary:	A utility used to generate documentation out of tags in source files
 Group:		Development/Languages
@ -991,18 +972,16 @@ Erlang mode for XEmacs (source lisp files).
 # start of autogenerated prep patch list
 %patch1 -p1 -b .Do_not_format_man_pages_and_do_not_install_miscellan
 %patch2 -p1 -b .Remove_rpath
-%patch3 -p1 -b .Fix_for_dlopening_libGL_and_libGLU
-%patch4 -p1 -b .Do_not_install_C_sources
-%patch5 -p1 -b .Do_not_install_Java_sources
-%patch6 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n
-%patch7 -p1 -b .Do_not_install_VxWorks_specific_docs
-%patch8 -p1 -b .Do_not_install_erlang_sources
+%patch3 -p1 -b .Do_not_install_C_sources
+%patch4 -p1 -b .Do_not_install_Java_sources
+%patch5 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n
+%patch6 -p1 -b .Do_not_install_VxWorks_specific_docs
+%patch7 -p1 -b .Do_not_install_erlang_sources
 %if 0%{?el4}%{?el5}%{?el6}
 %ifnarch %{ix86} x86_64
-%patch9 -p1 -b .Ugly_workaround_for_java_1_5_0_gcj_which_doesn_t_sup
+%patch8 -p1 -b .Ugly_workaround_for_java_1_5_0_gcj_which_doesn_t_sup
 %endif
 %endif
-%patch10 -p1 -b .Remove_rpath_from_esock_ssl
 # end of autogenerated prep patch list

 # remove shipped zlib sources
@ -1417,7 +1396,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/erlang/man/man4/diameter_dict.*
 %endif

-
 %files doc
 %defattr(-,root,root)
 %if %{with doc}
@ -1426,17 +1404,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/%{n_uvr}/lib/
 %endif

-
-%files docbuilder
-%defattr(-,root,root)
-%{_libdir}/erlang/lib/docbuilder-*/
-%if %{with doc}
-%{_libdir}/erlang/man/man3/docb_gen.*
-%{_libdir}/erlang/man/man3/docb_transform.*
-%{_libdir}/erlang/man/man3/docb_xml_check.*
-%{_libdir}/erlang/man/man6/docbuilder.*
-%endif
-
 %files edoc
 %defattr(-,root,root)
 %{_libdir}/erlang/lib/edoc-*/
@ -1452,6 +1419,7 @@ rm -rf $RPM_BUILD_ROOT
 %files erl_docgen
 %defattr(-,root,root)
 %{_libdir}/erlang/lib/erl_docgen-*/
+%{_libdir}/erlang/man/man6/erl_docgen.*

 %files erl_interface
 %defattr(-,root,root)
@ -1753,6 +1721,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/erlang/lib/observer-*/
 %if %{with doc}
 %{_libdir}/erlang/man/man3/crashdump.*
+%{_libdir}/erlang/man/man3/observer.*
 %{_libdir}/erlang/man/man3/ttb.*
 %{_libdir}/erlang/man/man6/observer.*
 %endif
@ -1959,10 +1928,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir %{_libdir}/erlang/lib/ssl-*/
 %{_libdir}/erlang/lib/ssl-*/ebin
-%{_libdir}/erlang/lib/ssl-*/priv
 %{_libdir}/erlang/lib/ssl-*/src
 %if %{with doc}
-%{_libdir}/erlang/man/man3/old_ssl.*
 %{_libdir}/erlang/man/man3/ssl.*
 %{_libdir}/erlang/man/man3/ssl_session_cache_api.*
 %{_libdir}/erlang/man/man6/ssl.*
@ -2021,7 +1988,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/erlang/man/man3/queue.*
 %{_libdir}/erlang/man/man3/random.*
 %{_libdir}/erlang/man/man3/re.*
-%{_libdir}/erlang/man/man3/regexp.*
 %{_libdir}/erlang/man/man3/sets.*
 %{_libdir}/erlang/man/man3/shell.*
 %{_libdir}/erlang/man/man3/shell_default.*
@ -2318,6 +2284,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/erlang/man/man3/wxStyledTextCtrl.*
 %{_libdir}/erlang/man/man3/wxStyledTextEvent.*
 %{_libdir}/erlang/man/man3/wxSysColourChangedEvent.*
+%{_libdir}/erlang/man/man3/wxSystemOptions.*
 %{_libdir}/erlang/man/man3/wxSystemSettings.*
 %{_libdir}/erlang/man/man3/wxTextAttr.*
 %{_libdir}/erlang/man/man3/wxTextCtrl.*
@ -2378,6 +2345,9 @@ rm -rf $RPM_BUILD_ROOT


 %changelog
+* Tue Feb 07 2012 Peter Lemenkov <lemenkov@gmail.com> - R15B-00.1
+- Ver. R15B
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - R14B-04.1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

--- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
+++ b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
@ -10,7 +10,7 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 2 files changed, 0 insertions(+), 14 deletions(-)

 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
-index 4754328..080cac6 100644
+index c3c242b..1fc47a1 100644
 --- a/erts/etc/common/Makefile.in
 +++ b/erts/etc/common/Makefile.in
@@ -537,10 +537,6 @@ endif
--- a/otp-0002-Remove-rpath.patch
+++ b/otp-0002-Remove-rpath.patch
@ -6,11 +6,10 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 ---
 lib/crypto/c_src/Makefile.in |    2 +-
 lib/crypto/priv/Makefile     |    2 +-
- lib/ssl/c_src/Makefile.in    |    6 +++---
- 3 files changed, 5 insertions(+), 5 deletions(-)
+ 2 files changed, 2 insertions(+), 2 deletions(-)

 diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
-index c2a986c..48ba130 100644
+index 2855376..3f0f5c4 100644
 --- a/lib/crypto/c_src/Makefile.in
 +++ b/lib/crypto/c_src/Makefile.in
@@ -84,7 +84,7 @@ endif
@ -35,34 +34,3 @@ index 0989f14..0d29444 100644
 	-o $@ $^ -lcrypto
 
 $(DLL_NIFLIB): $(OBJS)
-diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in
-index 6e413e7..cf2d267 100644
--- a/lib/ssl/c_src/Makefile.in
-+++ b/lib/ssl/c_src/Makefile.in
-@@ -107,7 +107,7 @@ else
- SSL_MAKEFILE =
- endif
- 
-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@
-+CC_R_FLAG=
- 
- ifeq ($(findstring @,$(CC_R_FLAG)),@)
- # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@;
-@@ -119,7 +119,7 @@ else
- ifeq ($(findstring osf,$(TARGET)),osf)		# osf1: -Wl,-rpath,
- CC_R_FLAG = -Wl,-rpath,
- else						# Default: -Wl,-R
-CC_R_FLAG = -Wl,-R
-+CC_R_FLAG =
- endif
- endif
- endif
-@@ -127,7 +127,7 @@ endif
- ifeq ($(strip $(CC_R_FLAG)),)
- CC_R_OPT =
- else
-CC_R_OPT = $(CC_R_FLAG)$(SSL_LIBDIR)
-+CC_R_OPT =
- endif
- 
- SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@
--- a/otp-0003-Do-not-install-C-sources.patch
+++ b/otp-0003-Do-not-install-C-sources.patch
@ -11,28 +11,27 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 lib/megaco/src/flex/Makefile.in   |    2 +-
 lib/odbc/c_src/Makefile.in        |    3 ---
 lib/os_mon/c_src/Makefile.in      |    1 -
- lib/ssl/c_src/Makefile.in         |    9 ---------
 lib/tools/c_src/Makefile.in       |    2 --
- 9 files changed, 1 insertions(+), 41 deletions(-)
+ 8 files changed, 1 insertions(+), 32 deletions(-)

 diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
-index 9e9cb18..1d73d3c 100644
+index 8c06be5..7013289 100644
 --- a/lib/asn1/c_src/Makefile
 +++ b/lib/asn1/c_src/Makefile
-@@ -125,8 +125,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -112,8 +112,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/priv/lib
- 	$(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib
+ 	$(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) $(RELSYSDIR)/priv/lib
 -	$(INSTALL_DIR) $(RELSYSDIR)/c_src
-	$(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src
+-	$(INSTALL_DATA) *.c $(RELSYSDIR)/c_src
 
 release_docs_spec:
 
 diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
-index 48ba130..553195b 100644
+index 3f0f5c4..ba7ab1c 100644
 --- a/lib/crypto/c_src/Makefile.in
 +++ b/lib/crypto/c_src/Makefile.in
-@@ -137,10 +137,7 @@ docs:
+@@ -133,10 +133,7 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
@ -44,10 +43,10 @@ index 48ba130..553195b 100644
 
 release_docs_spec:
 diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
-index 8ff142a..d785902 100644
+index d6b0ca1..91a2cc9 100644
 --- a/lib/erl_interface/src/Makefile.in
 +++ b/lib/erl_interface/src/Makefile.in
-@@ -876,29 +876,11 @@ release: opt
+@@ -846,29 +846,11 @@ release: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/include
 	$(INSTALL_DIR) $(RELSYSDIR)/lib
 	$(INSTALL_DIR) $(RELSYSDIR)/bin
@ -78,10 +77,10 @@ index 8ff142a..d785902 100644
 release_docs:
 
 diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in
-index 6eef782..091895b 100644
+index 5e034c4..c101201 100644
 --- a/lib/ic/c_src/Makefile.in
 +++ b/lib/ic/c_src/Makefile.in
-@@ -144,10 +144,8 @@ $(OBJDIR)/%.o: %.c
+@@ -140,10 +140,8 @@ $(OBJDIR)/%.o: %.c
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
@ -93,7 +92,7 @@ index 6eef782..091895b 100644
 	$(INSTALL_DATA) $(LIBRARY) $(RELSYSDIR)/priv/lib
 
 diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
-index 5af651d..2ccf2a9 100644
+index 7d82644..27275f2 100644
 --- a/lib/megaco/src/flex/Makefile.in
 +++ b/lib/megaco/src/flex/Makefile.in
@@ -279,7 +279,7 @@ release_spec: opt
@ -106,10 +105,10 @@ index 5af651d..2ccf2a9 100644
 endif
 
 diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in
-index ed3eeb1..c01d9bf 100644
+index 3a96a53..bbf0d7b 100644
 --- a/lib/odbc/c_src/Makefile.in
 +++ b/lib/odbc/c_src/Makefile.in
-@@ -131,11 +131,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -128,11 +128,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 ifdef EXE_TARGET
@ -122,10 +121,10 @@ index ed3eeb1..c01d9bf 100644
 endif
 
 diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in
-index 1a371eb..62eac66 100644
+index bac0413..5c32296 100644
 --- a/lib/os_mon/c_src/Makefile.in
 +++ b/lib/os_mon/c_src/Makefile.in
-@@ -136,7 +136,6 @@ release_spec:
+@@ -132,7 +132,6 @@ release_spec:
 else
 release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/src
@ -133,31 +132,11 @@ index 1a371eb..62eac66 100644
 	$(INSTALL_DIR) $(RELSYSDIR)/priv/bin
 	$(INSTALL_PROGRAM) $(TARGET_FILES) $(RELSYSDIR)/priv/bin
 endif
-diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in
-index cf2d267..502c127 100644
--- a/lib/ssl/c_src/Makefile.in
-+++ b/lib/ssl/c_src/Makefile.in
-@@ -201,15 +201,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/priv/bin
- 	$(INSTALL_PROGRAM) $(PORT_PROGRAM) $(RELSYSDIR)/priv/bin
-ifneq ($(SSL_MAKEFILE),)
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/obj
-	$(INSTALL_DATA) $(OBJS) $(RELSYSDIR)/priv/obj
-	sed 	-e "s;%BINDIR%;../bin;" \
-		-e "s;%SSL_LIBDIR%;$(SSL_LIBDIR);" \
-		-e "s;%OBJS;$(OBJS);" \
-		-e "s;%LIBS%;$(LIBS);" ./Makefile.dist \
-		> $(RELSYSDIR)/priv/obj/Makefile
-endif
- 
- release_docs_spec:
- 
 diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
-index 65a7f5f..144c1ba 100644
+index 604332a..f9648b23 100644
 --- a/lib/tools/c_src/Makefile.in
 +++ b/lib/tools/c_src/Makefile.in
-@@ -190,8 +190,6 @@ include ../vsn.mk
+@@ -185,8 +185,6 @@ include ../vsn.mk
 RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN)
 
 release_spec: all
--- a/otp-0003-Fix-for-dlopening-libGL-and-libGLU.patch
+++ b/otp-0003-Fix-for-dlopening-libGL-and-libGLU.patch
@ -1,24 +0,0 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Fri, 16 Apr 2010 21:13:47 +0400
-Subject: [PATCH] Fix for dlopening libGL and libGLU
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
- lib/wx/c_src/egl_impl.cpp |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/wx/c_src/egl_impl.cpp b/lib/wx/c_src/egl_impl.cpp
-index 6d873ab..18916c0 100644
--- a/lib/wx/c_src/egl_impl.cpp
-+++ b/lib/wx/c_src/egl_impl.cpp
-@@ -70,8 +70,8 @@ typedef char DL_CHAR;
- #  define OPENGL_LIB "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
- #  define OPENGLU_LIB "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib"
- # else
-#  define OPENGL_LIB "libGL.so"
-#  define OPENGLU_LIB "libGLU.so"
-+#  define OPENGL_LIB "libGL.so.1"
-+#  define OPENGLU_LIB "libGLU.so.1"
- # endif
- #endif
- extern "C" {
--- a/otp-0004-Do-not-install-Java-sources.patch
+++ b/otp-0004-Do-not-install-Java-sources.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Do not install Java sources
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 ---
 lib/ic/java_src/com/ericsson/otp/ic/Makefile       |    2 --
- .../java_src/com/ericsson/otp/erlang/Makefile.otp  |    2 --
+ .../java_src/com/ericsson/otp/erlang/Makefile      |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)

 diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
@ -21,12 +21,12 @@ index f730749..f7ec624 100644
 	$(INSTALL_DIR) $(RELSYSDIR)/priv
 	$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) $(RELSYSDIR)/priv
 
-diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile.otp b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile.otp
-index d0ff9cd..9990d2b 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile.otp
-+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile.otp
+diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
+index 365798e..68deb9c 100644
+--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
@@ -99,8 +99,6 @@ release release_docs release_tests release_html:
- 	$(MAKE) -f Makefile.otp $(MFLAGS) RELEASE_PATH=$(RELEASE_PATH) $(TARGET_MAKEFILE)  $@_spec
+ 	$(MAKE) $(MFLAGS) RELEASE_PATH=$(RELEASE_PATH) $(TARGET_MAKEFILE)  $@_spec
 
 release_spec: opt
 -	$(INSTALL_DIR) $(RELSYSDIR)/java_src/com/ericsson/otp/erlang
--- a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
+++ b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
--- a/otp-0006-Do-not-install-VxWorks-specific-docs.patch
+++ b/otp-0006-Do-not-install-VxWorks-specific-docs.patch
--- a/otp-0007-Do-not-install-erlang-sources.patch
+++ b/otp-0007-Do-not-install-erlang-sources.patch
@ -20,10 +20,7 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 lib/crypto/src/Makefile            |    2 --
 lib/debugger/src/Makefile          |    2 +-
 lib/dialyzer/src/Makefile          |    2 +-
- lib/diameter/src/app/Makefile       |    1 -
- lib/diameter/src/compiler/Makefile  |    2 +-
- lib/diameter/src/transport/Makefile |    2 --
- lib/docbuilder/src/Makefile         |    2 +-
+ lib/diameter/src/Makefile          |    6 ++----
 lib/edoc/src/Makefile              |    2 +-
 lib/erl_docgen/src/Makefile        |    2 --
 lib/et/src/Makefile                |    1 -
@ -83,7 +80,7 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 lib/webtool/src/Makefile           |    2 --
 lib/wx/src/Makefile                |    4 ++--
 lib/xmerl/src/Makefile             |    4 +---
- 78 files changed, 58 insertions(+), 106 deletions(-)
+ 75 files changed, 58 insertions(+), 105 deletions(-)

 diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile
 index 1456388..81db627 100644
@ -112,7 +109,7 @@ index 43f4f08..7e2d9b1 100644
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
 
 diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile
-index 2733cde..42a674e 100644
+index 3a59773..17ebb53 100644
 --- a/lib/asn1/src/Makefile
 +++ b/lib/asn1/src/Makefile
@@ -155,7 +155,7 @@ release_spec: opt
@ -125,10 +122,10 @@ index 2733cde..42a674e 100644
 	$(INSTALL_DATA) $(EXAMPLES) $(RELSYSDIR)/examples
 
 diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile
-index 84b122b..5c01656 100644
+index 125aa82..b62fe0f 100644
 --- a/lib/common_test/src/Makefile
 +++ b/lib/common_test/src/Makefile
-@@ -132,7 +132,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -133,7 +133,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/src
@ -138,10 +135,10 @@ index 84b122b..5c01656 100644
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
 	$(INSTALL_DIR) $(RELSYSDIR)/include
 diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile
-index 1238d11..93747f6 100644
+index 7a23760..20fea4e 100644
 --- a/lib/compiler/src/Makefile
 +++ b/lib/compiler/src/Makefile
-@@ -162,8 +162,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -163,8 +163,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/src
@ -153,10 +150,10 @@ index 1238d11..93747f6 100644
 	$(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin
 
 diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile
-index a62d47c..66ce6d9 100644
+index f8e751f..369ad08 100644
 --- a/lib/cosEvent/src/Makefile
 +++ b/lib/cosEvent/src/Makefile
-@@ -200,7 +200,7 @@ release_spec: opt
+@@ -202,7 +202,7 @@ release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
 	$(INSTALL_DIR) $(RELSYSDIR)/src
@ -166,10 +163,10 @@ index a62d47c..66ce6d9 100644
 	$(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
 
 diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile
-index 56a67cd..19933c9 100644
+index 409cac4..722ec46 100644
 --- a/lib/cosEventDomain/src/Makefile
 +++ b/lib/cosEventDomain/src/Makefile
-@@ -166,7 +166,7 @@ release_spec: opt
+@@ -171,7 +171,7 @@ release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
 	$(INSTALL_DIR) $(RELSYSDIR)/src
@ -179,10 +176,10 @@ index 56a67cd..19933c9 100644
 	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) $(RELSYSDIR)/include
 
 diff --git a/lib/cosFileTransfer/src/Makefile b/lib/cosFileTransfer/src/Makefile
-index 773ed7f..8f79d8c 100644
+index 1d51304..c5cb87a 100644
 --- a/lib/cosFileTransfer/src/Makefile
 +++ b/lib/cosFileTransfer/src/Makefile
-@@ -174,8 +174,7 @@ release_spec: opt
+@@ -179,8 +179,7 @@ release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
 	$(INSTALL_DIR) $(RELSYSDIR)/src
@ -193,10 +190,10 @@ index 773ed7f..8f79d8c 100644
 	$(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
 
 diff --git a/lib/cosNotification/src/Makefile b/lib/cosNotification/src/Makefile
-index 637c633..659b780 100644
+index 92225c6..4568cd7 100644
 --- a/lib/cosNotification/src/Makefile
 +++ b/lib/cosNotification/src/Makefile
-@@ -361,8 +361,7 @@ release_spec: opt
+@@ -370,8 +370,7 @@ release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
 	$(INSTALL_DIR) $(RELSYSDIR)/src
@ -207,10 +204,10 @@ index 637c633..659b780 100644
 	$(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
 
 diff --git a/lib/cosProperty/src/Makefile b/lib/cosProperty/src/Makefile
-index 1d2119d..a210fec 100644
+index 8060421..2a83d28 100644
 --- a/lib/cosProperty/src/Makefile
 +++ b/lib/cosProperty/src/Makefile
-@@ -175,8 +175,7 @@ release_spec: opt
+@@ -179,8 +179,7 @@ release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
 	$(INSTALL_DIR) $(RELSYSDIR)/src
@ -221,10 +218,10 @@ index 1d2119d..a210fec 100644
 	$(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
 
 diff --git a/lib/cosTime/src/Makefile b/lib/cosTime/src/Makefile
-index 3b6f7ba..f66e548 100644
+index 18c25ca..c3df6a0 100644
 --- a/lib/cosTime/src/Makefile
 +++ b/lib/cosTime/src/Makefile
-@@ -197,8 +197,7 @@ release_spec: opt
+@@ -198,8 +198,7 @@ release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
 	$(INSTALL_DIR) $(RELSYSDIR)/src
@ -235,10 +232,10 @@ index 3b6f7ba..f66e548 100644
 	$(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
 
 diff --git a/lib/cosTransactions/src/Makefile b/lib/cosTransactions/src/Makefile
-index 7e10ec1..4485209 100644
+index 3c799ca..3b35bac 100644
 --- a/lib/cosTransactions/src/Makefile
 +++ b/lib/cosTransactions/src/Makefile
-@@ -168,7 +168,7 @@ release_spec: opt
+@@ -173,7 +173,7 @@ release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
 	$(INSTALL_DIR) $(RELSYSDIR)/src
@ -261,10 +258,10 @@ index 0e886ce..d24ab24 100644
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \
 		$(APPUP_TARGET) $(RELSYSDIR)/ebin
 diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile
-index 8551fe8..244d169 100644
+index be9a2d1..073c3aa 100644
 --- a/lib/debugger/src/Makefile
 +++ b/lib/debugger/src/Makefile
-@@ -129,7 +129,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -130,7 +130,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/src
@ -286,57 +283,23 @@ index 810f86d..f3f2b22 100644
 		$(RELSYSDIR)/src
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin
-diff --git a/lib/diameter/src/app/Makefile b/lib/diameter/src/app/Makefile
-index a75c70d..ba3d10e 100644
--- a/lib/diameter/src/app/Makefile
-+++ b/lib/diameter/src/app/Makefile
-@@ -177,7 +177,6 @@ release_spec: opt
- 	$(INSTALL_DIR)  $(RELSYSDIR)/examples
- 	$(INSTALL_SCRIPT) $(ESCRIPT_FILES) $(RELSYSDIR)/bin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(MODULES:%=%.erl) $(SPEC_ERL_FILES) $(RELSYSDIR)/src/app
- 	$(INSTALL_DATA) $(SPEC_FILES) $(RELSYSDIR)/src/app
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/app
- 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(SPEC_HRL_FILES) $(RELSYSDIR)/include
-diff --git a/lib/diameter/src/compiler/Makefile b/lib/diameter/src/compiler/Makefile
-index 779013b..edc7a3d 100644
--- a/lib/diameter/src/compiler/Makefile
-+++ b/lib/diameter/src/compiler/Makefile
-@@ -107,7 +107,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src/compiler
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/compiler
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/compiler
+diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
+index 2ec016e..d86733a 100644
+--- a/lib/diameter/src/Makefile
+++ b/lib/diameter/src/Makefile
+@@ -201,10 +201,8 @@ release_spec: opt
+ 	$(MAKE) $(TARGET_DIRS:%/=release_src_%)
+ 
+ $(TARGET_DIRS:%/=release_src_%): release_src_%:
+-	$(INSTALL_DATA) $(filter $*/%, $(TARGET_MODULES:%=%.erl) \
+-	                               $(INTERNAL_HRLS)) \
+-	                $(filter $*/%, compiler/$(DICT_YRL).yrl) \
+-	                $(RELSYSDIR)/src/$*
+	$(INSTALL_DATA) $(filter $*/%, $(INTERNAL_HRLS)) \
+	                $(RELSYSDIR)/src/$* || true
 
 release_docs_spec:
 
-diff --git a/lib/diameter/src/transport/Makefile b/lib/diameter/src/transport/Makefile
-index 4b53100..7bcc1b9 100644
--- a/lib/diameter/src/transport/Makefile
-+++ b/lib/diameter/src/transport/Makefile
-@@ -116,8 +116,6 @@ endif
- release_spec: opt
- 	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/transport
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/transport
- 
- release_docs_spec:
- 
-diff --git a/lib/docbuilder/src/Makefile b/lib/docbuilder/src/Makefile
-index e8a07a5..d0ac3a9 100644
--- a/lib/docbuilder/src/Makefile
-+++ b/lib/docbuilder/src/Makefile
-@@ -109,7 +109,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
- 
 diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile
 index fcb0b61..2082ca6 100644
 --- a/lib/edoc/src/Makefile
@ -351,10 +314,10 @@ index fcb0b61..2082ca6 100644
 release_docs_spec:
 
 diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile
-index 8e81bcc..c636b87 100644
+index cbaf6e4..d3cdbd6 100644
 --- a/lib/erl_docgen/src/Makefile
 +++ b/lib/erl_docgen/src/Makefile
-@@ -87,8 +87,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+@@ -89,8 +89,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
@ -376,23 +339,23 @@ index bb6632e..3e71e02 100644
 	$(INSTALL_DIR)  $(RELSYSDIR)/include
 	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
 diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile
-index 4897c20..f3d69e9 100644
+index bec2fdb..0814f12 100644
 --- a/lib/eunit/src/Makefile
 +++ b/lib/eunit/src/Makefile
-@@ -104,8 +104,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -109,8 +109,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(OBJECTS) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) $(RELSYSDIR)/ebin
 -	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(SOURCES) $(RELSYSDIR)/src
+-	$(INSTALL_DATA) $(PARSE_TRANSFORM) $(SOURCES) $(RELSYSDIR)/src
 	$(INSTALL_DIR) $(RELSYSDIR)/include
 	$(INSTALL_DATA) $(INCLUDE_DELIVERABLES) $(RELSYSDIR)/include
 
 diff --git a/lib/gs/src/Makefile b/lib/gs/src/Makefile
-index a648d3c..3757ac1 100644
+index 43b5302..37e836a 100644
 --- a/lib/gs/src/Makefile
 +++ b/lib/gs/src/Makefile
-@@ -106,8 +106,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -108,8 +108,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/src
@ -469,7 +432,7 @@ index 98a69d6..23073cd 100644
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
 
 diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile
-index 55d20af..04d667c 100644
+index 690045b..70fb146 100644
 --- a/lib/hipe/rtl/Makefile
 +++ b/lib/hipe/rtl/Makefile
@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
@ -529,10 +492,10 @@ index 19b9387..f3ff8bf 100644
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
 
 diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile
-index 0397b48..2692c7c 100644
+index d490e59..961324e 100644
 --- a/lib/inets/src/http_client/Makefile
 +++ b/lib/inets/src/http_client/Makefile
-@@ -92,7 +92,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -91,7 +91,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DIR)  $(RELSYSDIR)/src
 	$(INSTALL_DIR)  $(RELSYSDIR)/src/http_client
@ -568,10 +531,10 @@ index 55cc68d..78e46ae 100644
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
 
 diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile
-index 20e2291..a4e4763 100644
+index d99e33b..5ddf947 100644
 --- a/lib/inets/src/inets_app/Makefile
 +++ b/lib/inets/src/inets_app/Makefile
-@@ -111,7 +111,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -112,7 +112,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DIR)  $(RELSYSDIR)/src
 	$(INSTALL_DIR)  $(RELSYSDIR)/src/inets_app
@ -607,10 +570,10 @@ index 1f2f8b1..9f7652d 100644
 #	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
 diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
-index 9db6014..55e0085 100644
+index 54f21eb..9b6e3eb 100644
 --- a/lib/kernel/src/Makefile
 +++ b/lib/kernel/src/Makefile
-@@ -196,7 +196,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -199,7 +199,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/src
@ -658,7 +621,7 @@ index 3943f4b..879abff 100644
 
 
 diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
-index 2ccf2a9..985bec2 100644
+index 27275f2..a45b7c3 100644
 --- a/lib/megaco/src/flex/Makefile.in
 +++ b/lib/megaco/src/flex/Makefile.in
@@ -276,7 +276,6 @@ release_spec: opt
@ -722,10 +685,10 @@ index 1c8ec54..cc00b60 100644
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
 
 diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
-index 3875b62..cebfbab 100644
+index ca26afc..dd43454 100644
 --- a/lib/observer/src/Makefile
 +++ b/lib/observer/src/Makefile
-@@ -114,7 +114,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -129,7 +129,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/src
@ -747,10 +710,10 @@ index b48dd76..deb9947 100644
 	$(INSTALL_DATA) $(EXT_HRL_FILES) $(RELSYSDIR)/include 
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin	
 diff --git a/lib/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile
-index d3deec7..80be6e9 100644
+index 064447f..b464b55 100644
 --- a/lib/orber/COSS/CosNaming/Makefile
 +++ b/lib/orber/COSS/CosNaming/Makefile
-@@ -142,8 +142,8 @@ release_spec: opt
+@@ -144,8 +144,8 @@ release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(RELSYSDIR)/ebin
 	$(INSTALL_DIR) $(RELSYSDIR)/COSS/CosNaming
@ -762,10 +725,10 @@ index d3deec7..80be6e9 100644
 
 release_docs_spec:
 diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile
-index ccc4493..41e7972 100644
+index d2e9868..5ff5803 100644
 --- a/lib/orber/src/Makefile
 +++ b/lib/orber/src/Makefile
-@@ -258,7 +258,7 @@ release_spec: opt
+@@ -257,7 +257,7 @@ release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
 	$(INSTALL_DIR) $(RELSYSDIR)/src
@ -839,10 +802,10 @@ index e573e57..bdbced1 100644
 	$(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) $(RELSYSDIR)/ebin
 
 diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile
-index 5a24b02..5fe76ab 100644
+index 062c495..954bf7c 100644
 --- a/lib/public_key/src/Makefile
 +++ b/lib/public_key/src/Makefile
-@@ -47,8 +47,6 @@ MODULES = \
+@@ -48,8 +48,6 @@ MODULES = \
 
 HRL_FILES = $(INCLUDE)/public_key.hrl 
 
@ -851,7 +814,7 @@ index 5a24b02..5fe76ab 100644
 ERL_FILES = $(MODULES:%=%.erl)
 
 TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
-@@ -101,8 +99,6 @@ $(APPUP_TARGET):	$(APPUP_SRC) ../vsn.mk
+@@ -102,8 +100,6 @@ $(APPUP_TARGET):	$(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
@ -874,10 +837,10 @@ index 4e6a112..cef22b5 100644
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
 diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile
-index 4f831f3..c8bd229 100644
+index 946409b..da82d79 100644
 --- a/lib/runtime_tools/src/Makefile
 +++ b/lib/runtime_tools/src/Makefile
-@@ -92,8 +92,6 @@ docs:
+@@ -93,8 +93,6 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
@ -964,10 +927,10 @@ index 48d76bd..9f1f868 100644
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
 # 	$(INSTALL_DIR) $(RELSYSDIR)/include
 diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
-index 42880fa..d657098 100644
+index da31d87..e08e4e1 100644
 --- a/lib/ssh/src/Makefile
 +++ b/lib/ssh/src/Makefile
-@@ -144,7 +144,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -141,7 +141,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/src
@ -977,10 +940,10 @@ index 42880fa..d657098 100644
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
 	$(INSTALL_DIR) $(RELSYSDIR)/include
 diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
-index 7514ad2..c8be1ae 100644
+index dc69b53..63ac81e 100644
 --- a/lib/ssl/src/Makefile
 +++ b/lib/ssl/src/Makefile
-@@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -112,7 +112,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/src
@ -990,10 +953,10 @@ index 7514ad2..c8be1ae 100644
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \
 	$(APPUP_TARGET) $(RELSYSDIR)/ebin
 diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile
-index 600303d..c335586 100644
+index 90e239b..31cb268 100644
 --- a/lib/stdlib/src/Makefile
 +++ b/lib/stdlib/src/Makefile
-@@ -200,7 +200,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -199,7 +199,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/src
@ -1015,10 +978,10 @@ index 50369e6..12c6db4 100644
 release_docs_spec:
 
 diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile
-index 63a585d..4855056 100644
+index 4bc5187..90419de 100644
 --- a/lib/test_server/src/Makefile
 +++ b/lib/test_server/src/Makefile
-@@ -126,7 +126,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -125,7 +125,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/src
@ -1092,10 +1055,10 @@ index 62845cd..841cf11 100644
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
 		$(RELSYSDIR)/ebin
 diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile
-index 46bc062..486b623 100644
+index 4e5971d..888b6f2 100644
 --- a/lib/wx/src/Makefile
 +++ b/lib/wx/src/Makefile
-@@ -111,9 +111,9 @@ ifeq ($(INSIDE_ERLSRC), true)
+@@ -123,9 +123,9 @@ ifeq ($(INSIDE_ERLSRC), true)
 include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt 
 	$(INSTALL_DIR) $(RELSYSDIR)/src
--- a/otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch
+++ b/otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch
--- a/otp-0010-Remove-rpath-from-esock_ssl.patch
+++ b/otp-0010-Remove-rpath-from-esock_ssl.patch
@ -1,23 +0,0 @@
-From: Hans Ulrich Niedermann <hun@n-dimensional.de>
-Date: Mon, 31 Jan 2011 13:33:28 +0100
-Subject: [PATCH] Remove rpath from esock_ssl
-
-Unset SSL_CC_RUNTIME_LIBRARY_PATH to build esock_ssl
-without rpathes.
---
- lib/ssl/c_src/Makefile.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in
-index 502c127..e111950 100644
--- a/lib/ssl/c_src/Makefile.in
-+++ b/lib/ssl/c_src/Makefile.in
-@@ -130,7 +130,7 @@ else
- CC_R_OPT =
- endif
- 
-SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@
-+SSL_CC_RUNTIME_LIBRARY_PATH=
- # Sigh...
- ifeq ($(findstring @,$(SSL_CC_RUNTIME_LIBRARY_PATH)),@)
- SSL_CC_RUNTIME_LIBRARY_PATH = $(CC_R_OPT)
--- a/6
+++ b/6
@ -1,3 +1,3 @@
-4b469729f103f52702bfb1fb24529dc0  otp_src_R14B04.tar.gz
-2a440aa8c1242dd0c79785d69f0d97ca  otp_doc_html_R14B04.tar.gz
-f31e72518daae4007f595c0b224dd59f  otp_doc_man_R14B04.tar.gz
+80553f4730b04aad4c9994590bad3fe6  otp_doc_html_R15B.tar.gz
+9738da523737712a9db87db0dee05338  otp_doc_man_R15B.tar.gz
+dd6c2a4807551b4a8a536067bde31d73  otp_src_R15B.tar.gz