[erlang] Ver. R15B01

Peter Lemenkov peter at fedoraproject.org
Mon May 7 11:40:56 UTC 2012 

commit 5203c4fd2bd4c0c19a217e5fad95f65de1168010
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Mon May 7 15:40:47 2012 +0400

    Ver. R15B01
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 .gitignore                                         |    3 +
 erlang.spec                                        |   64 ++++++++++---
 ...at-man-pages-and-do-not-install-miscellan.patch |    6 +-
 otp-0003-Do-not-install-C-sources.patch            |   39 ++++++--
 otp-0004-Do-not-install-Java-sources.patch         |    6 +-
 ...0006-Do-not-install-VxWorks-specific-docs.patch |    2 +-
 otp-0007-Do-not-install-erlang-sources.patch       |  103 ++++++++++++--------
 ...ound-for-java-1.5.0-gcj-which-doesn-t-sup.patch |    4 +-
 sources                                            |    3 +
 9 files changed, 154 insertions(+), 76 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c546419..472c090 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,6 @@ otp_src_R14A.tar.gz
 /otp_doc_html_R15B.tar.gz
 /otp_doc_man_R15B.tar.gz
 /otp_src_R15B.tar.gz
+/otp_doc_html_R15B01.tar.gz
+/otp_doc_man_R15B01.tar.gz
+/otp_src_R15B01.tar.gz
diff --git a/erlang.spec b/erlang.spec
index fdfdfb4..a8e813b 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -1,7 +1,7 @@
 %global upstream_ver R15B
 # Do NOT change %%{upstream_rel} unless UPSTREAM has actually changed it!
-#%global upstream_rel 01
-%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.
 
@@ -121,6 +121,7 @@ Requires: erlang-debugger%{?_isa} = %{version}-%{release}
 Requires: erlang-dialyzer%{?_isa} = %{version}-%{release}
 Requires: erlang-diameter%{?_isa} = %{version}-%{release}
 Requires: erlang-edoc%{?_isa} = %{version}-%{release}
+Requires: erlang-eldap%{?_isa} = %{version}-%{release}
 Requires: erlang-erl_docgen%{?_isa} = %{version}-%{release}
 Requires: erlang-erl_interface%{?_isa} = %{version}-%{release}
 Requires: erlang-erts%{?_isa} = %{version}-%{release}
@@ -204,6 +205,7 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-inets%{?_isa} = %{version}-%{release}
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
 Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release}
+Requires: %{name}-sasl%{?_isa} = %{version}-%{release}
 Requires: %{name}-snmp%{?_isa} = %{version}-%{release}
 Requires: %{name}-ssh%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
@@ -367,14 +369,12 @@ A DIscrepany AnaLYZer for ERlang programs.
 Summary:	Diameter (RFC 3588) library
 Group:		Development/Languages
 BuildRequires:	ed
-#Requires: %{name}-compiler%{?_isa} = %{version}-%{release}
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
-#Requires: %{name}-gs%{?_isa} = %{version}-%{release}
-#Requires: %{name}-hipe%{?_isa} = %{version}-%{release}
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
+Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release}
+Requires: %{name}-ssl%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
-#Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release}
-#Requires: %{name}-wx%{?_isa} = %{version}-%{release}
+Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release}
 Obsoletes:	%{name} < R13B-04.5
 
 %description diameter
@@ -395,7 +395,6 @@ Documentation for Erlang.
 %package edoc
 Summary:	A utility used to generate documentation out of tags in source files
 Group:		Development/Languages
-Requires: %{name}-compiler%{?_isa} = %{version}-%{release}
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-inets%{?_isa} = %{version}-%{release}
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
@@ -407,10 +406,26 @@ Obsoletes:	%{name} < R13B-04.5
 %description edoc
 A utility used to generate documentation out of tags in source files.
 
+%package eldap
+Summary:	Erlang LDAP library
+Group:		Development/Languages
+Requires: %{name}-asn1%{?_isa} = %{version}-%{release}
+Requires: %{name}-erts%{?_isa} = %{version}-%{release}
+Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
+Requires: %{name}-ssl%{?_isa} = %{version}-%{release}
+Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description eldap
+Erlang LDAP library.
+
 %package erl_docgen
 Summary:	A utility used to generate erlang HTML documentation
 Group:		Development/Languages
+Requires:	%{name}-edoc%{?_isa} = %{version}-%{release}
 Requires:	%{name}-erts%{?_isa} = %{version}-%{release}
+Requires:	%{name}-stdlib%{?_isa} = %{version}-%{release}
+Requires:	%{name}-xmerl%{?_isa} = %{version}-%{release}
 Obsoletes:	%{name} < R13B-04.5
 
 %description erl_docgen
@@ -539,12 +554,12 @@ Group:		Development/Languages
 Requires:	%{name}-erts%{?_isa} = %{version}-%{release}
 Obsoletes:	%{name} < R13B-04.5
 %if 0%{?fedora}
-BuildRequires:	java-1.6.0-openjdk-devel
+BuildRequires:	java-devel
 %else
 %ifarch %{ix86} x86_64
-BuildRequires:	java-1.6.0-openjdk-devel
+BuildRequires:	java-devel
 %else
-BuildRequires:	java-1.5.0-gcj-devel
+BuildRequires:	java-devel-gcj
 %endif
 %endif
 
@@ -592,6 +607,7 @@ A heavy duty real-time distributed database.
 %package observer
 Summary:	A set of tools for tracing and investigation of distributed systems
 Group:		Development/Languages
+Requires: %{name}-appmon%{?_isa} = %{version}-%{release}
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-et%{?_isa} = %{version}-%{release}
 Requires: %{name}-gs%{?_isa} = %{version}-%{release}
@@ -600,6 +616,7 @@ Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
 Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
 Requires: %{name}-webtool%{?_isa} = %{version}-%{release}
+Requires: %{name}-wx%{?_isa} = %{version}-%{release}
 Obsoletes:	%{name} < R13B-04.5
 
 %description observer
@@ -699,6 +716,7 @@ A graphical process manager used to inspect Erlang processes.
 %package public_key
 Summary:	API to public key infrastructure
 Group:		Development/Languages
+Requires: %{name}-asn1%{?_isa} = %{version}-%{release}
 Requires: %{name}-crypto%{?_isa} = %{version}-%{release}
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
@@ -733,6 +751,7 @@ Summary:	A set of tools to include in a production system
 Group:		Development/Languages
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
+Requires: %{name}-mnesia%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
 Obsoletes:	%{name} < R13B-04.5
 
@@ -1204,6 +1223,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files common_test
 %defattr(-,root,root)
+%{_bindir}/ct_run
 %{_libdir}/erlang/lib/common_test-*/
 %if %{with doc}
 %{_libdir}/erlang/man/man3/ct.*
@@ -1416,6 +1436,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/erlang/man/man3/edoc_run.*
 %endif
 
+%files eldap
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/eldap-*/
+%if %{with doc}
+%{_libdir}/erlang/man/man3/eldap.*
+%endif
+
 %files erl_docgen
 %defattr(-,root,root)
 %{_libdir}/erlang/lib/erl_docgen-*/
@@ -1476,7 +1503,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/erlang/bin/start_erl
 %{_libdir}/erlang/bin/start_sasl.boot
 %{_libdir}/erlang/bin/to_erl
-%dir %{_libdir}/erlang/erts-*/bin
+%dir %{_libdir}/erlang/erts-*/
+%dir %{_libdir}/erlang/erts-*/bin/
 %{_libdir}/erlang/erts-*/bin/beam
 %{_libdir}/erlang/erts-*/bin/beam.smp
 %{_libdir}/erlang/erts-*/bin/child_setup
@@ -1496,8 +1524,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/erlang/erts-*/bin/start_erl.src
 %{_libdir}/erlang/erts-*/bin/to_erl
 %{_libdir}/erlang/erts-*/include
-%{_libdir}/erlang/erts-*/lib
-%{_libdir}/erlang/erts-*/src
+%{_libdir}/erlang/erts-*/lib/
+%{_libdir}/erlang/erts-*/src/
 %{_libdir}/erlang/lib/erts-*/
 %if %{with doc}
 %{_libdir}/erlang/man/man1/ct_run.*
@@ -1610,6 +1638,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/erlang/lib/inets-*/src
 %if %{with doc}
 %{_libdir}/erlang/man/man3/ftp.*
+%{_libdir}/erlang/man/man3/http_uri.*
 %{_libdir}/erlang/man/man3/httpc.*
 %{_libdir}/erlang/man/man3/httpd.*
 %{_libdir}/erlang/man/man3/httpd_conf.*
@@ -1827,6 +1856,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/erlang/lib/runtime_tools-*/
 %if %{with doc}
 %{_libdir}/erlang/man/man3/dbg.*
+%{_libdir}/erlang/man/man3/dyntrace.*
 %{_libdir}/erlang/man/man3/erts_alloc_config.*
 %{_libdir}/erlang/man/man6/runtime_tools.*
 %endif
@@ -2286,6 +2316,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/erlang/man/man3/wxSysColourChangedEvent.*
 %{_libdir}/erlang/man/man3/wxSystemOptions.*
 %{_libdir}/erlang/man/man3/wxSystemSettings.*
+%{_libdir}/erlang/man/man3/wxTaskBarIcon.*
+%{_libdir}/erlang/man/man3/wxTaskBarIconEvent.*
 %{_libdir}/erlang/man/man3/wxTextAttr.*
 %{_libdir}/erlang/man/man3/wxTextCtrl.*
 %{_libdir}/erlang/man/man3/wxTextDataObject.*
@@ -2345,6 +2377,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon May 07 2012 Peter Lemenkov <lemenkov at gmail.com> - R15B-01.1
+- Ver. R15B01
+- New sub-package - eldap
+
 * Tue Feb 07 2012 Peter Lemenkov <lemenkov at gmail.com> - R15B-00.1
 - Ver. R15B
 
diff --git 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
index ebdc00b..82fb476 100644
--- 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
@@ -7,13 +7,13 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
  erts/etc/common/Makefile.in |    4 ----
  erts/etc/unix/Install.src   |   10 ----------
- 2 files changed, 0 insertions(+), 14 deletions(-)
+ 2 files changed, 14 deletions(-)
 
 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
-index c3c242b..1fc47a1 100644
+index 28c5e5c..5f7aaf1 100644
 --- a/erts/etc/common/Makefile.in
 +++ b/erts/etc/common/Makefile.in
-@@ -537,10 +537,6 @@ endif
+@@ -565,10 +565,6 @@ endif
  ifneq ($(INSTALL_TOP_BIN),)
  	$(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) $(RELEASE_PATH)
  endif
diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch
index ce14a75..ce673a0 100644
--- a/otp-0003-Do-not-install-C-sources.patch
+++ b/otp-0003-Do-not-install-C-sources.patch
@@ -2,17 +2,20 @@ From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Fri, 18 Jun 2010 23:41:33 +0400
 Subject: [PATCH] Do not install C sources
 
+Don't install *.c and *.o files at all.
+
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
- lib/asn1/c_src/Makefile           |    2 --
- lib/crypto/c_src/Makefile.in      |    3 ---
- lib/erl_interface/src/Makefile.in |   18 ------------------
- lib/ic/c_src/Makefile.in          |    2 --
- lib/megaco/src/flex/Makefile.in   |    2 +-
- lib/odbc/c_src/Makefile.in        |    3 ---
- lib/os_mon/c_src/Makefile.in      |    1 -
- lib/tools/c_src/Makefile.in       |    2 --
- 8 files changed, 1 insertions(+), 32 deletions(-)
+ lib/asn1/c_src/Makefile             |    2 --
+ lib/crypto/c_src/Makefile.in        |    3 ---
+ lib/erl_interface/src/Makefile.in   |   18 ------------------
+ lib/ic/c_src/Makefile.in            |    2 --
+ lib/megaco/src/flex/Makefile.in     |    2 +-
+ lib/odbc/c_src/Makefile.in          |    3 ---
+ lib/os_mon/c_src/Makefile.in        |    1 -
+ lib/runtime_tools/c_src/Makefile.in |    2 --
+ lib/tools/c_src/Makefile.in         |    2 --
+ 9 files changed, 1 insertion(+), 34 deletions(-)
 
 diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
 index 8c06be5..7013289 100644
@@ -132,11 +135,25 @@ index bac0413..5c32296 100644
  	$(INSTALL_DIR) $(RELSYSDIR)/priv/bin
  	$(INSTALL_PROGRAM) $(TARGET_FILES) $(RELSYSDIR)/priv/bin
  endif
+diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in
+index cbbcfa2..20f1ca6 100644
+--- a/lib/runtime_tools/c_src/Makefile.in
++++ b/lib/runtime_tools/c_src/Makefile.in
+@@ -193,9 +193,7 @@ docs:
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) $(RELSYSDIR)/priv/obj
+ 	$(INSTALL_DIR) $(RELSYSDIR)/priv/lib
+-	$(INSTALL_PROGRAM) $(DYNTRACE_OBJS) $(RELSYSDIR)/priv/obj
+ 	$(INSTALL_PROGRAM) $(NIF_LIB) $(SOLIBS) $(RELSYSDIR)/priv/lib
+ 
+ release_docs_spec:
 diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
-index 604332a..f9648b23 100644
+index b8c4aed..f7f5dff 100644
 --- a/lib/tools/c_src/Makefile.in
 +++ b/lib/tools/c_src/Makefile.in
-@@ -185,8 +185,6 @@ include ../vsn.mk
+@@ -188,8 +188,6 @@ include ../vsn.mk
  RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN)
  
  release_spec: all
diff --git a/otp-0004-Do-not-install-Java-sources.patch b/otp-0004-Do-not-install-Java-sources.patch
index 007c871..3804969 100644
--- a/otp-0004-Do-not-install-Java-sources.patch
+++ b/otp-0004-Do-not-install-Java-sources.patch
@@ -4,9 +4,9 @@ Subject: [PATCH] Do not install Java sources
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
- lib/ic/java_src/com/ericsson/otp/ic/Makefile       |    2 --
- .../java_src/com/ericsson/otp/erlang/Makefile      |    2 --
- 2 files changed, 0 insertions(+), 4 deletions(-)
+ lib/ic/java_src/com/ericsson/otp/ic/Makefile             |    2 --
+ lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile |    2 --
+ 2 files changed, 4 deletions(-)
 
 diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
 index f730749..f7ec624 100644
diff --git a/otp-0006-Do-not-install-VxWorks-specific-docs.patch b/otp-0006-Do-not-install-VxWorks-specific-docs.patch
index 8bfd141..76a8803 100644
--- a/otp-0006-Do-not-install-VxWorks-specific-docs.patch
+++ b/otp-0006-Do-not-install-VxWorks-specific-docs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not install VxWorks-specific docs
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
  erts/doc/src/Makefile |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ 1 file changed, 1 deletion(-)
 
 diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile
 index cfa5527..d18b615 100644
diff --git a/otp-0007-Do-not-install-erlang-sources.patch b/otp-0007-Do-not-install-erlang-sources.patch
index d91778d..4c97f1f 100644
--- a/otp-0007-Do-not-install-erlang-sources.patch
+++ b/otp-0007-Do-not-install-erlang-sources.patch
@@ -2,6 +2,8 @@ From: Hans Ulrich Niedermann <hun at n-dimensional.de>
 Date: Mon, 21 Mar 2011 15:41:49 +0100
 Subject: [PATCH] Do not install erlang sources
 
+Don't install *.erl, *.xrl, *.yrl, and *.asn1 files at all.
+
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 Signed-off-by: Hans Ulrich Niedermann <hun at n-dimensional.de>
 ---
@@ -20,8 +22,9 @@ Signed-off-by: Hans Ulrich Niedermann <hun at n-dimensional.de>
  lib/crypto/src/Makefile            |    2 --
  lib/debugger/src/Makefile          |    2 +-
  lib/dialyzer/src/Makefile          |    2 +-
- lib/diameter/src/Makefile          |    6 ++----
+ lib/diameter/src/Makefile          |    7 ++-----
  lib/edoc/src/Makefile              |    2 +-
+ lib/eldap/src/Makefile             |    4 ----
  lib/erl_docgen/src/Makefile        |    2 --
  lib/et/src/Makefile                |    1 -
  lib/eunit/src/Makefile             |    2 --
@@ -80,7 +83,7 @@ Signed-off-by: Hans Ulrich Niedermann <hun at n-dimensional.de>
  lib/webtool/src/Makefile           |    2 --
  lib/wx/src/Makefile                |    4 ++--
  lib/xmerl/src/Makefile             |    4 +---
- 75 files changed, 58 insertions(+), 105 deletions(-)
+ 76 files changed, 58 insertions(+), 110 deletions(-)
 
 diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile
 index 1456388..81db627 100644
@@ -109,10 +112,10 @@ index 43f4f08..7e2d9b1 100644
  	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
  
 diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile
-index 3a59773..17ebb53 100644
+index 5614cbe..1857cbf 100644
 --- a/lib/asn1/src/Makefile
 +++ b/lib/asn1/src/Makefile
-@@ -155,7 +155,7 @@ release_spec: opt
+@@ -156,7 +156,7 @@ release_spec: opt
  	$(INSTALL_DIR) $(RELSYSDIR)/ebin
  	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
  	$(INSTALL_DIR) $(RELSYSDIR)/src
@@ -122,10 +125,10 @@ index 3a59773..17ebb53 100644
  	$(INSTALL_DATA) $(EXAMPLES) $(RELSYSDIR)/examples
  
 diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile
-index 125aa82..b62fe0f 100644
+index 6a16c6f..7547e47 100644
 --- a/lib/common_test/src/Makefile
 +++ b/lib/common_test/src/Makefile
-@@ -133,7 +133,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -134,7 +134,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  	$(INSTALL_DIR) $(RELSYSDIR)/src
@@ -135,10 +138,10 @@ index 125aa82..b62fe0f 100644
  	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
  	$(INSTALL_DIR) $(RELSYSDIR)/include
 diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile
-index 7a23760..20fea4e 100644
+index 3415517..9aea1f3 100644
 --- a/lib/compiler/src/Makefile
 +++ b/lib/compiler/src/Makefile
-@@ -163,8 +163,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -164,8 +164,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  	$(INSTALL_DIR) $(RELSYSDIR)/src
@@ -271,7 +274,7 @@ index be9a2d1..073c3aa 100644
  	$(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) $(RELSYSDIR)/ebin
  
 diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile
-index 810f86d..f3f2b22 100644
+index 04f3b84..083a568 100644
 --- a/lib/dialyzer/src/Makefile
 +++ b/lib/dialyzer/src/Makefile
 @@ -153,7 +153,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
@@ -284,13 +287,14 @@ index 810f86d..f3f2b22 100644
  	$(INSTALL_DIR) $(RELSYSDIR)/ebin
  	$(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin
 diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
-index 2ec016e..d86733a 100644
+index dbfaa4e..51db955 100644
 --- a/lib/diameter/src/Makefile
 +++ b/lib/diameter/src/Makefile
-@@ -201,10 +201,8 @@ release_spec: opt
- 	$(MAKE) $(TARGET_DIRS:%/=release_src_%)
+@@ -206,11 +206,8 @@ release_spec: opt
+ 	$(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%)
  
  $(TARGET_DIRS:%/=release_src_%): release_src_%:
+-	$(INSTALL_DIR) $(RELSYSDIR)/src/$*
 -	$(INSTALL_DATA) $(filter $*/%, $(TARGET_MODULES:%=%.erl) \
 -	                               $(INTERNAL_HRLS)) \
 -	                $(filter $*/%, compiler/$(DICT_YRL).yrl) \
@@ -298,8 +302,8 @@ index 2ec016e..d86733a 100644
 +	$(INSTALL_DATA) $(filter $*/%, $(INTERNAL_HRLS)) \
 +	                $(RELSYSDIR)/src/$* || true
  
- release_docs_spec:
- 
+ $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%:
+ 	$(INSTALL_DIR) $(RELSYSDIR)/examples/$*
 diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile
 index fcb0b61..2082ca6 100644
 --- a/lib/edoc/src/Makefile
@@ -313,6 +317,21 @@ index fcb0b61..2082ca6 100644
  
  release_docs_spec:
  
+diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile
+index 4ddb808..02072fa 100644
+--- a/lib/eldap/src/Makefile
++++ b/lib/eldap/src/Makefile
+@@ -98,10 +98,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt
+ 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
+-	$(INSTALL_DIR) $(RELSYSDIR)/src
+-	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
+-	$(INSTALL_DIR) $(RELSYSDIR)/asn1
+-	$(INSTALL_DATA) ../asn1/$(ASN1_FILES) $(RELSYSDIR)/asn1
+ 	$(INSTALL_DIR) $(RELSYSDIR)/include
+ 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include
+ 
 diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile
 index cbaf6e4..d3cdbd6 100644
 --- a/lib/erl_docgen/src/Makefile
@@ -367,10 +386,10 @@ index 43b5302..37e836a 100644
  	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
  	$(INSTALL_DIR) $(RELSYSDIR)/priv/bitmap
 diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile
-index 7fcc44d..6e41e6b 100644
+index 14e68f5..2828bc7 100644
 --- a/lib/hipe/cerl/Makefile
 +++ b/lib/hipe/cerl/Makefile
-@@ -98,7 +98,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  	$(INSTALL_DIR) $(RELSYSDIR)/cerl
@@ -380,10 +399,10 @@ index 7fcc44d..6e41e6b 100644
  	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
  
 diff --git a/lib/hipe/flow/Makefile b/lib/hipe/flow/Makefile
-index 02f6105..9fa7078 100644
+index 1a531fd..9f1a098 100644
 --- a/lib/hipe/flow/Makefile
 +++ b/lib/hipe/flow/Makefile
-@@ -98,7 +98,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  	$(INSTALL_DIR) $(RELSYSDIR)/flow
@@ -393,10 +412,10 @@ index 02f6105..9fa7078 100644
  	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
  
 diff --git a/lib/hipe/icode/Makefile b/lib/hipe/icode/Makefile
-index eced90b..e48c64e 100644
+index 0d940d4..54c4263 100644
 --- a/lib/hipe/icode/Makefile
 +++ b/lib/hipe/icode/Makefile
-@@ -116,7 +116,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -119,7 +119,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  	$(INSTALL_DIR) $(RELSYSDIR)/icode
@@ -406,10 +425,10 @@ index eced90b..e48c64e 100644
  	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
  
 diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile
-index a14c9c3..163bded 100644
+index fc8923d..5b94d90 100644
 --- a/lib/hipe/main/Makefile
 +++ b/lib/hipe/main/Makefile
-@@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -117,7 +117,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
  	$(INSTALL_DATA) ../vsn.mk $(RELSYSDIR)
  	$(INSTALL_DIR) $(RELSYSDIR)/main
@@ -432,10 +451,10 @@ index 98a69d6..23073cd 100644
  	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
  
 diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile
-index 690045b..70fb146 100644
+index 3002683..40efb6f 100644
 --- a/lib/hipe/rtl/Makefile
 +++ b/lib/hipe/rtl/Makefile
-@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -104,7 +104,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  	$(INSTALL_DIR) $(RELSYSDIR)/rtl
@@ -445,7 +464,7 @@ index 690045b..70fb146 100644
  	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
  
 diff --git a/lib/hipe/util/Makefile b/lib/hipe/util/Makefile
-index 85719ec..ae2cbc0 100644
+index 2f17eee..083933b 100644
 --- a/lib/hipe/util/Makefile
 +++ b/lib/hipe/util/Makefile
 @@ -49,7 +49,6 @@ HIPE_MODULES =
@@ -456,7 +475,7 @@ index 85719ec..ae2cbc0 100644
  ERL_FILES= $(MODULES:%=%.erl)
  TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
  DOC_FILES= $(MODULES:%=$(DOCS)/%.html)
-@@ -100,8 +99,6 @@ $(DOCS)/%.html:%.erl
+@@ -103,8 +102,6 @@ $(DOCS)/%.html:%.erl
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
@@ -518,10 +537,10 @@ index aaf3cfb..0236a49 100644
  	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
  
 diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile
-index 55cc68d..78e46ae 100644
+index 60bb0d2..bfc2986 100644
 --- a/lib/inets/src/http_server/Makefile
 +++ b/lib/inets/src/http_server/Makefile
-@@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -125,7 +125,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
  	$(INSTALL_DIR)  $(RELSYSDIR)/src
  	$(INSTALL_DIR)  $(RELSYSDIR)/src/http_server
@@ -531,10 +550,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 d99e33b..5ddf947 100644
+index 6da6a1d..5e9951a 100644
 --- a/lib/inets/src/inets_app/Makefile
 +++ b/lib/inets/src/inets_app/Makefile
-@@ -112,7 +112,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -113,7 +113,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
  	$(INSTALL_DIR)  $(RELSYSDIR)/src
  	$(INSTALL_DIR)  $(RELSYSDIR)/src/inets_app
@@ -685,10 +704,10 @@ index 1c8ec54..cc00b60 100644
  	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
  
 diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
-index ca26afc..dd43454 100644
+index 91a4c65..b14dc4b 100644
 --- a/lib/observer/src/Makefile
 +++ b/lib/observer/src/Makefile
-@@ -129,7 +129,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -130,7 +130,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  	$(INSTALL_DIR) $(RELSYSDIR)/src
@@ -837,10 +856,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 946409b..da82d79 100644
+index cb302b7..0cd12ba 100644
 --- a/lib/runtime_tools/src/Makefile
 +++ b/lib/runtime_tools/src/Makefile
-@@ -93,8 +93,6 @@ docs:
+@@ -99,8 +99,6 @@ docs:
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
@@ -848,7 +867,7 @@ index 946409b..da82d79 100644
 -	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
  	$(INSTALL_DIR) $(RELSYSDIR)/include
  	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) $(RELSYSDIR)/examples
 diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile
 index 9a5d1e4..4dd511f 100644
 --- a/lib/sasl/src/Makefile
@@ -927,10 +946,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 da31d87..e08e4e1 100644
+index 1734ae4..99eb3a4 100644
 --- a/lib/ssh/src/Makefile
 +++ b/lib/ssh/src/Makefile
-@@ -141,7 +141,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -128,7 +128,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  	$(INSTALL_DIR) $(RELSYSDIR)/src
@@ -965,7 +984,7 @@ index 90e239b..31cb268 100644
  	$(INSTALL_DIR) $(RELSYSDIR)/include
  	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
 diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile
-index 50369e6..12c6db4 100644
+index bac138e..2cce48c 100644
 --- a/lib/syntax_tools/src/Makefile
 +++ b/lib/syntax_tools/src/Makefile
 @@ -82,8 +82,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
@@ -1055,10 +1074,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 4e5971d..888b6f2 100644
+index 16b425e..f42521a 100644
 --- a/lib/wx/src/Makefile
 +++ b/lib/wx/src/Makefile
-@@ -123,9 +123,9 @@ ifeq ($(INSIDE_ERLSRC), true)
+@@ -121,9 +121,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES)
  include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt 
  	$(INSTALL_DIR) $(RELSYSDIR)/src
@@ -1071,10 +1090,10 @@ index 4e5971d..888b6f2 100644
  	$(INSTALL_DATA) $(EXT_HRL) $(RELSYSDIR)/include
  	$(INSTALL_DIR) $(RELSYSDIR)/ebin
 diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile
-index 7009b50..c9c7303 100644
+index a5dbe45..52fe190 100644
 --- a/lib/xmerl/src/Makefile
 +++ b/lib/xmerl/src/Makefile
-@@ -218,9 +218,7 @@ release_spec: opt
+@@ -217,9 +217,7 @@ release_spec: opt
  	$(INSTALL_DIR) $(RELSYSDIR)/ebin
  	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
  	$(INSTALL_DIR) $(RELSYSDIR)/src
diff --git 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
index 2eb3dd5..1062a4c 100644
--- 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
@@ -10,8 +10,8 @@ Fedora-Spec-Before: %ifnarch %{ix86} x86_64
 Fedora-Spec-After: %endif
 Fedora-Spec-After: %endif
 ---
- .../com/ericsson/otp/erlang/OtpErlangList.java     |   14 +-------------
- .../com/ericsson/otp/erlang/OtpInputStream.java    |   13 ++-----------
+ .../java_src/com/ericsson/otp/erlang/OtpErlangList.java  |   14 +-------------
+ .../java_src/com/ericsson/otp/erlang/OtpInputStream.java |   13 ++-----------
  2 files changed, 3 insertions(+), 24 deletions(-)
 
 diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangList.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangList.java
diff --git a/sources b/sources
index 203970d..14e9e70 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,6 @@
 80553f4730b04aad4c9994590bad3fe6  otp_doc_html_R15B.tar.gz
 9738da523737712a9db87db0dee05338  otp_doc_man_R15B.tar.gz
 dd6c2a4807551b4a8a536067bde31d73  otp_src_R15B.tar.gz
+7569cae680eecd64e7e5d952be788ee5  otp_doc_html_R15B01.tar.gz
+d87412c2a1e6005bbe29dfe642a9ca20  otp_doc_man_R15B01.tar.gz
+f12d00f6e62b36ad027d6c0c08905fad  otp_src_R15B01.tar.gz

More information about the scm-commits mailing list