From ebf67f01df62e9f3f4a3251f3eab8d6b89e4a6eb Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Jul 21 2011 05:43:32 +0000 Subject: Ver. R14B03 Signed-off-by: Peter Lemenkov --- diff --git a/.gitignore b/.gitignore index 66d85e5..2e73d1f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ otp_src_R14A.tar.gz /otp_doc_html_R14B02.tar.gz /otp_doc_man_R14B02.tar.gz /otp_src_R14B02.tar.gz +/otp_src_R14B03.tar.gz +/otp_doc_html_R14B03.tar.gz +/otp_doc_man_R14B03.tar.gz diff --git a/erlang.spec b/erlang.spec index 85026e3..475e629 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,6 +1,6 @@ %global upstream_ver R14B # Do NOT change %%{upstream_rel} unless UPSTREAM has actually changed it! -%global upstream_rel 02 +%global upstream_rel 03 #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. @@ -18,14 +18,14 @@ %if 0%{fedora} < 16 %define use_prebuilt_docs 0 %else -%define use_prebuilt_docs 1 +%define use_prebuilt_docs 0 %endif %global n_uvr %{name}-%{upstream_ver}-%{upstream_rel_for_rpm} Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.2%{?dist} +Release: %{upstream_rel_for_rpm}.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -73,7 +73,7 @@ Patch5: otp-0005-Do-not-install-Java-sources.patch # Fix install dir typo for snmp man3 Patch6: otp-0006-Fix-install-dir-typo-for-snmp-man3.patch # Fedora specific patch -# Do not install nteventlog and related doc-files on non-win32 systems +# Do not install nteventlog and related doc-files on non-win32 Patch7: otp-0007-Do-not-install-nteventlog-and-related-doc-files-on-n.patch # Fedora specific patch # Do not install *.bat files on non-win32 machines @@ -85,7 +85,7 @@ Patch9: otp-0009-Do-not-install-VxWorks-specific-docs.patch # Do not install erlang sources Patch10: otp-0010-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 UNICODE fully +# Ugly workaround for java-1.5.0-gcj which doesn't support Patch11: otp-0011-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch # Fedora specific patch # Remove rpath from esock_ssl @@ -374,6 +374,23 @@ Obsoletes: %{name} < R13B-04.5 %description dialyzer A DIscrepany AnaLYZer for ERlang programs. +%package diameter +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}-stdlib%{?_isa} = %{version}-%{release} +#Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} +#Requires: %{name}-wx%{?_isa} = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description diameter +Diameter (RFC 3588) library + %package doc Summary: Erlang documentation Group: Development/Languages @@ -1265,7 +1282,10 @@ rm -rf $RPM_BUILD_ROOT %files cosFileTransfer %defattr(-,root,root) -%{_libdir}/erlang/lib/cosFileTransfer-*/ +%dir %{_libdir}/erlang/lib/cosFileTransfer-*/ +%{_libdir}/erlang/lib/cosFileTransfer-*/ebin +%{_libdir}/erlang/lib/cosFileTransfer-*/include +%{_libdir}/erlang/lib/cosFileTransfer-*/src %if %{with doc} %{_libdir}/erlang/man/man3/cosFileTransferApp.* %{_libdir}/erlang/man/man3/CosFileTransfer_Directory.* @@ -1277,7 +1297,10 @@ rm -rf $RPM_BUILD_ROOT %files cosNotification %defattr(-,root,root) -%{_libdir}/erlang/lib/cosNotification-*/ +%dir %{_libdir}/erlang/lib/cosNotification-*/ +%{_libdir}/erlang/lib/cosNotification-*/ebin +%{_libdir}/erlang/lib/cosNotification-*/include +%{_libdir}/erlang/lib/cosNotification-*/src %if %{with doc} %{_libdir}/erlang/man/man3/CosNotification.* %{_libdir}/erlang/man/man3/CosNotification_AdminPropertiesAdmin.* @@ -1311,7 +1334,10 @@ rm -rf $RPM_BUILD_ROOT %files cosProperty %defattr(-,root,root) -%{_libdir}/erlang/lib/cosProperty-*/ +%dir %{_libdir}/erlang/lib/cosProperty-*/ +%{_libdir}/erlang/lib/cosProperty-*/ebin +%{_libdir}/erlang/lib/cosProperty-*/include +%{_libdir}/erlang/lib/cosProperty-*/src %if %{with doc} %{_libdir}/erlang/man/man3/cosProperty.* %{_libdir}/erlang/man/man3/CosPropertyService_PropertiesIterator.* @@ -1324,7 +1350,10 @@ rm -rf $RPM_BUILD_ROOT %files cosTime %defattr(-,root,root) -%{_libdir}/erlang/lib/cosTime-*/ +%dir %{_libdir}/erlang/lib/cosTime-*/ +%{_libdir}/erlang/lib/cosTime-*/ebin +%{_libdir}/erlang/lib/cosTime-*/include +%{_libdir}/erlang/lib/cosTime-*/src %if %{with doc} %{_libdir}/erlang/man/man3/cosTime.* %{_libdir}/erlang/man/man3/CosTimerEvent_TimerEventHandler.* @@ -1336,7 +1365,10 @@ rm -rf $RPM_BUILD_ROOT %files cosTransactions %defattr(-,root,root) -%{_libdir}/erlang/lib/cosTransactions-*/ +%dir %{_libdir}/erlang/lib/cosTransactions-*/ +%{_libdir}/erlang/lib/cosTransactions-*/ebin +%{_libdir}/erlang/lib/cosTransactions-*/include +%{_libdir}/erlang/lib/cosTransactions-*/src %if %{with doc} %{_libdir}/erlang/man/man3/cosTransactions.* %{_libdir}/erlang/man/man3/CosTransactions_Control.* @@ -1375,6 +1407,24 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/dialyzer.* %endif +%files diameter +%defattr(-,root,root) +%dir %{_libdir}/erlang/lib/diameter-*/ +%{_libdir}/erlang/lib/diameter-*/bin +%{_libdir}/erlang/lib/diameter-*/ebin +%{_libdir}/erlang/lib/diameter-*/include +%{_libdir}/erlang/lib/diameter-*/src +%if %{with doc} +%{_libdir}/erlang/man/man1/diameter_compile.* +%{_libdir}/erlang/man/man3/diameter.* +%{_libdir}/erlang/man/man3/diameter_app.* +%{_libdir}/erlang/man/man3/diameter_sctp.* +%{_libdir}/erlang/man/man3/diameter_tcp.* +%{_libdir}/erlang/man/man3/diameter_transport.* +%{_libdir}/erlang/man/man4/diameter_dict.* +%endif + + %files doc %defattr(-,root,root) %if %{with doc} @@ -1535,6 +1585,12 @@ rm -rf $RPM_BUILD_ROOT %files examples %defattr(-,root,root) %{_libdir}/erlang/lib/asn1-*/examples +#%{_libdir}/erlang/lib/cosFileTransfer-*/examples +#%{_libdir}/erlang/lib/cosNotification-*/examples +#%{_libdir}/erlang/lib/cosProperty-*/examples +#%{_libdir}/erlang/lib/cosTime-*/examples +#%{_libdir}/erlang/lib/cosTransactions-*/examples +%{_libdir}/erlang/lib/diameter-*/examples %{_libdir}/erlang/lib/et-*/examples %{_libdir}/erlang/lib/eunit-*/examples %{_libdir}/erlang/lib/gs-*/examples @@ -1546,7 +1602,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/observer-*/examples %{_libdir}/erlang/lib/orber-*/examples %{_libdir}/erlang/lib/reltool-*/examples +%{_libdir}/erlang/lib/sasl-*/examples %{_libdir}/erlang/lib/snmp-*/examples +#%{_libdir}/erlang/lib/ssh-*/examples %{_libdir}/erlang/lib/ssl-*/examples %{_libdir}/erlang/lib/stdlib-*/examples %{_libdir}/erlang/lib/syntax_tools-*/examples @@ -1813,7 +1871,9 @@ rm -rf $RPM_BUILD_ROOT %files sasl %defattr(-,root,root) -%{_libdir}/erlang/lib/sasl-*/ +%dir %{_libdir}/erlang/lib/sasl-*/ +%{_libdir}/erlang/lib/sasl-*/ebin +%{_libdir}/erlang/lib/sasl-*/src %if %{with doc} %{_libdir}/erlang/man/man3/alarm_handler.* %{_libdir}/erlang/man/man3/overload.* @@ -1885,11 +1945,15 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man7/SNMPv2-TM.* %{_libdir}/erlang/man/man7/SNMP-VIEW-BASED-ACM-MIB.* %{_libdir}/erlang/man/man7/STANDARD-MIB.* +%{_libdir}/erlang/man/man7/TRANSPORT-ADDRESS-MIB.* %endif %files ssh %defattr(-,root,root) -%{_libdir}/erlang/lib/ssh-*/ +%dir %{_libdir}/erlang/lib/ssh-*/ +%{_libdir}/erlang/lib/ssh-*/ebin +%{_libdir}/erlang/lib/ssh-*/include +%{_libdir}/erlang/lib/ssh-*/src %if %{with doc} %{_libdir}/erlang/man/man3/ssh.* %{_libdir}/erlang/man/man3/ssh_channel.* @@ -2320,6 +2384,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 20 2011 Peter Lemenkov - R14B-03.1 +- Ver. R14B03 +- New module - diameter +- Several new examples directories + * Fri Apr 1 2011 Hans Ulrich Niedermann - R14B-02.2 - Work around fop-1.0-14.fc16 bug (#689930) by using prebuilt docs for f16/rawhide diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 9a87265..9ec3e35 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -10,7 +10,7 @@ Signed-off-by: Peter Lemenkov 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 040adcf..48f931d 100644 +index 276c84d..586c70e 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -83,7 +83,7 @@ endif @@ -19,7 +19,7 @@ index 040adcf..48f931d 100644 ifeq ($(DYNAMIC_CRYPTO_LIB),yes) -SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@ +SSL_DED_LD_RUNTIME_LIBRARY_PATH = - CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -lcrypto + CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) else SSL_DED_LD_RUNTIME_LIBRARY_PATH= diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile @@ -36,10 +36,10 @@ index 0989f14..0d29444 100644 $(DLL_NIFLIB): $(OBJS) diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in -index 49a209f..5e6c74e 100644 +index 6e413e7..cf2d267 100644 --- a/lib/ssl/c_src/Makefile.in +++ b/lib/ssl/c_src/Makefile.in -@@ -105,7 +105,7 @@ else +@@ -107,7 +107,7 @@ else SSL_MAKEFILE = endif @@ -48,7 +48,7 @@ index 49a209f..5e6c74e 100644 ifeq ($(findstring @,$(CC_R_FLAG)),@) # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; -@@ -117,7 +117,7 @@ else +@@ -119,7 +119,7 @@ else ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, CC_R_FLAG = -Wl,-rpath, else # Default: -Wl,-R @@ -57,7 +57,7 @@ index 49a209f..5e6c74e 100644 endif endif endif -@@ -125,7 +125,7 @@ endif +@@ -127,7 +127,7 @@ endif ifeq ($(strip $(CC_R_FLAG)),) CC_R_OPT = else diff --git a/otp-0004-Do-not-install-C-sources.patch b/otp-0004-Do-not-install-C-sources.patch index d4f380c..e3edc44 100644 --- a/otp-0004-Do-not-install-C-sources.patch +++ b/otp-0004-Do-not-install-C-sources.patch @@ -29,7 +29,7 @@ index 9e9cb18..1d73d3c 100644 release_docs_spec: diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 48f931d..4a7a183 100644 +index 586c70e..e6ab475 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -136,10 +136,7 @@ docs: @@ -134,10 +134,10 @@ index 1a371eb..62eac66 100644 $(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 5e6c74e..bf4843b 100644 +index cf2d267..502c127 100644 --- a/lib/ssl/c_src/Makefile.in +++ b/lib/ssl/c_src/Makefile.in -@@ -199,15 +199,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -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 diff --git a/otp-0007-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/otp-0007-Do-not-install-nteventlog-and-related-doc-files-on-n.patch index 5d6eb18..7f5dc25 100644 --- a/otp-0007-Do-not-install-nteventlog-and-related-doc-files-on-n.patch +++ b/otp-0007-Do-not-install-nteventlog-and-related-doc-files-on-n.patch @@ -1,6 +1,7 @@ From: Peter Lemenkov Date: Sat, 19 Jun 2010 09:59:39 +0400 -Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32 systems +Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32 + systems Signed-off-by: Peter Lemenkov --- diff --git a/otp-0010-Do-not-install-erlang-sources.patch b/otp-0010-Do-not-install-erlang-sources.patch index 3769d0a..ec9efa9 100644 --- a/otp-0010-Do-not-install-erlang-sources.patch +++ b/otp-0010-Do-not-install-erlang-sources.patch @@ -5,81 +5,85 @@ Subject: [PATCH] Do not install erlang sources Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann --- - erts/preloaded/src/Makefile | 2 -- - lib/appmon/src/Makefile | 2 +- - lib/asn1/src/Makefile | 2 +- - lib/common_test/src/Makefile | 2 +- - lib/compiler/src/Makefile | 4 ++-- - lib/cosEvent/src/Makefile | 2 +- - lib/cosEventDomain/src/Makefile | 2 +- - lib/cosFileTransfer/src/Makefile | 3 +-- - lib/cosNotification/src/Makefile | 3 +-- - lib/cosProperty/src/Makefile | 3 +-- - lib/cosTime/src/Makefile | 3 +-- - lib/cosTransactions/src/Makefile | 2 +- - lib/crypto/src/Makefile | 2 -- - lib/debugger/src/Makefile | 2 +- - lib/dialyzer/src/Makefile | 2 +- - lib/docbuilder/src/Makefile | 2 +- - lib/edoc/src/Makefile | 2 +- - lib/et/src/Makefile | 1 - - lib/eunit/src/Makefile | 2 -- - lib/gs/src/Makefile | 4 ++-- - lib/hipe/cerl/Makefile | 2 +- - lib/hipe/flow/Makefile | 2 +- - lib/hipe/icode/Makefile | 2 +- - lib/hipe/main/Makefile | 2 +- - lib/hipe/misc/Makefile | 2 +- - lib/hipe/rtl/Makefile | 2 +- - lib/hipe/util/Makefile | 3 --- - lib/ic/src/Makefile | 2 +- - lib/inets/src/ftp/Makefile | 2 +- - lib/inets/src/http_client/Makefile | 2 +- - lib/inets/src/http_lib/Makefile | 2 +- - lib/inets/src/http_server/Makefile | 2 +- - lib/inets/src/inets_app/Makefile | 2 +- - lib/inets/src/tftp/Makefile | 2 +- - lib/inviso/src/Makefile | 2 -- - lib/kernel/src/Makefile | 1 - - lib/megaco/src/app/Makefile | 2 +- - lib/megaco/src/binary/Makefile | 2 +- - lib/megaco/src/engine/Makefile | 2 +- - lib/megaco/src/flex/Makefile.in | 1 - - lib/megaco/src/tcp/Makefile | 2 +- - lib/megaco/src/text/Makefile | 2 +- - lib/megaco/src/udp/Makefile | 2 +- - lib/mnesia/src/Makefile | 2 +- - lib/observer/src/Makefile | 1 - - lib/odbc/src/Makefile | 2 +- - lib/orber/COSS/CosNaming/Makefile | 4 ++-- - lib/orber/src/Makefile | 2 +- - lib/os_mon/src/Makefile | 1 - - lib/otp_mibs/src/Makefile | 2 -- - lib/parsetools/src/Makefile | 2 -- - lib/percept/src/Makefile | 2 -- - lib/pman/src/Makefile | 2 +- - lib/public_key/src/Makefile | 4 ---- - lib/reltool/src/Makefile | 2 +- - lib/runtime_tools/src/Makefile | 2 -- - lib/sasl/src/Makefile | 1 - - lib/snmp/src/agent/Makefile | 2 +- - lib/snmp/src/app/Makefile | 2 +- - lib/snmp/src/compile/Makefile | 2 +- - lib/snmp/src/manager/Makefile | 2 +- - lib/snmp/src/misc/Makefile | 2 +- - lib/ssh/src/Makefile | 2 +- - lib/ssl/src/Makefile | 2 +- - lib/stdlib/src/Makefile | 1 - - lib/syntax_tools/src/Makefile | 2 -- - lib/test_server/src/Makefile | 1 - - lib/toolbar/src/Makefile | 2 +- - lib/tools/src/Makefile | 2 +- - lib/tv/src/Makefile | 2 +- - lib/typer/src/Makefile | 2 -- - lib/webtool/src/Makefile | 2 -- - lib/wx/src/Makefile | 4 ++-- - lib/xmerl/src/Makefile | 4 +--- - 74 files changed, 57 insertions(+), 100 deletions(-) + erts/preloaded/src/Makefile | 2 -- + lib/appmon/src/Makefile | 2 +- + lib/asn1/src/Makefile | 2 +- + lib/common_test/src/Makefile | 2 +- + lib/compiler/src/Makefile | 4 ++-- + lib/cosEvent/src/Makefile | 2 +- + lib/cosEventDomain/src/Makefile | 2 +- + lib/cosFileTransfer/src/Makefile | 3 +-- + lib/cosNotification/src/Makefile | 3 +-- + lib/cosProperty/src/Makefile | 3 +-- + lib/cosTime/src/Makefile | 3 +-- + lib/cosTransactions/src/Makefile | 2 +- + 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/edoc/src/Makefile | 2 +- + lib/erl_docgen/src/Makefile | 2 -- + lib/et/src/Makefile | 1 - + lib/eunit/src/Makefile | 2 -- + lib/gs/src/Makefile | 4 ++-- + lib/hipe/cerl/Makefile | 2 +- + lib/hipe/flow/Makefile | 2 +- + lib/hipe/icode/Makefile | 2 +- + lib/hipe/main/Makefile | 2 +- + lib/hipe/misc/Makefile | 2 +- + lib/hipe/rtl/Makefile | 2 +- + lib/hipe/util/Makefile | 3 --- + lib/ic/src/Makefile | 2 +- + lib/inets/src/ftp/Makefile | 2 +- + lib/inets/src/http_client/Makefile | 2 +- + lib/inets/src/http_lib/Makefile | 2 +- + lib/inets/src/http_server/Makefile | 2 +- + lib/inets/src/inets_app/Makefile | 2 +- + lib/inets/src/tftp/Makefile | 2 +- + lib/inviso/src/Makefile | 2 -- + lib/kernel/src/Makefile | 1 - + lib/megaco/src/app/Makefile | 2 +- + lib/megaco/src/binary/Makefile | 2 +- + lib/megaco/src/engine/Makefile | 2 +- + lib/megaco/src/flex/Makefile.in | 1 - + lib/megaco/src/tcp/Makefile | 2 +- + lib/megaco/src/text/Makefile | 2 +- + lib/megaco/src/udp/Makefile | 2 +- + lib/mnesia/src/Makefile | 2 +- + lib/observer/src/Makefile | 1 - + lib/odbc/src/Makefile | 2 +- + lib/orber/COSS/CosNaming/Makefile | 4 ++-- + lib/orber/src/Makefile | 2 +- + lib/os_mon/src/Makefile | 1 - + lib/otp_mibs/src/Makefile | 2 -- + lib/parsetools/src/Makefile | 2 -- + lib/percept/src/Makefile | 2 -- + lib/pman/src/Makefile | 2 +- + lib/public_key/src/Makefile | 4 ---- + lib/reltool/src/Makefile | 2 +- + lib/runtime_tools/src/Makefile | 2 -- + lib/sasl/src/Makefile | 1 - + lib/snmp/src/agent/Makefile | 2 +- + lib/snmp/src/app/Makefile | 2 +- + lib/snmp/src/compile/Makefile | 2 +- + lib/snmp/src/manager/Makefile | 2 +- + lib/snmp/src/misc/Makefile | 2 +- + lib/ssh/src/Makefile | 2 +- + lib/ssl/src/Makefile | 2 +- + lib/stdlib/src/Makefile | 1 - + lib/syntax_tools/src/Makefile | 2 -- + lib/test_server/src/Makefile | 1 - + lib/toolbar/src/Makefile | 2 +- + lib/tools/src/Makefile | 2 +- + lib/tv/src/Makefile | 2 +- + lib/typer/src/Makefile | 2 -- + lib/webtool/src/Makefile | 2 -- + lib/wx/src/Makefile | 4 ++-- + lib/xmerl/src/Makefile | 4 +--- + 78 files changed, 58 insertions(+), 106 deletions(-) diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile index 1456388..81db627 100644 @@ -282,6 +286,44 @@ 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 6de220d..322fb78 100644 +--- a/lib/diameter/src/app/Makefile ++++ b/lib/diameter/src/app/Makefile +@@ -169,7 +169,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 3ab7606..119a032 100644 +--- a/lib/diameter/src/compiler/Makefile ++++ b/lib/diameter/src/compiler/Makefile +@@ -117,7 +117,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 + + 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 @@ -308,6 +350,19 @@ index 9c5a9d3..5de4e3d 100644 release_docs_spec: +diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile +index 8e81bcc..c636b87 100644 +--- a/lib/erl_docgen/src/Makefile ++++ b/lib/erl_docgen/src/Makefile +@@ -87,8 +87,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt +- $(INSTALL_DIR) $(RELSYSDIR)/src +- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src + $(INSTALL_DIR) $(RELSYSDIR)/ebin + $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile index bb6632e..3e71e02 100644 --- a/lib/et/src/Makefile @@ -784,10 +839,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 b042b0c..947009c 100644 +index 5a24b02..5fe76ab 100644 --- a/lib/public_key/src/Makefile +++ b/lib/public_key/src/Makefile -@@ -46,8 +46,6 @@ MODULES = \ +@@ -47,8 +47,6 @@ MODULES = \ HRL_FILES = $(INCLUDE)/public_key.hrl @@ -796,7 +851,7 @@ index b042b0c..947009c 100644 ERL_FILES = $(MODULES:%=%.erl) TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) -@@ -100,8 +98,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk +@@ -101,8 +99,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -1037,10 +1092,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 3cc6683..83c5168 100644 +index 46bc062..486b623 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile -@@ -112,9 +112,9 @@ ifeq ($(INSIDE_ERLSRC), true) +@@ -111,9 +111,9 @@ ifeq ($(INSIDE_ERLSRC), true) include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src diff --git a/otp-0011-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch b/otp-0011-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch index 621f444..2eb3dd5 100644 --- a/otp-0011-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch +++ b/otp-0011-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch @@ -1,6 +1,7 @@ From: Peter Lemenkov Date: Sun, 21 Nov 2010 00:17:49 +0300 -Subject: [PATCH] Ugly workaround for java-1.5.0-gcj which doesn't support UNICODE fully +Subject: [PATCH] Ugly workaround for java-1.5.0-gcj which doesn't support + UNICODE fully Signed-off-by: Peter Lemenkov Fedora-Spec-Comment: Required only for el5, el6 on PowerPC diff --git a/otp-0012-Remove-rpath-from-esock_ssl.patch b/otp-0012-Remove-rpath-from-esock_ssl.patch index f5bb4d0..c58a7a9 100644 --- a/otp-0012-Remove-rpath-from-esock_ssl.patch +++ b/otp-0012-Remove-rpath-from-esock_ssl.patch @@ -9,10 +9,10 @@ without rpathes. 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in -index bf4843b..90fb679 100644 +index 502c127..e111950 100644 --- a/lib/ssl/c_src/Makefile.in +++ b/lib/ssl/c_src/Makefile.in -@@ -128,7 +128,7 @@ else +@@ -130,7 +130,7 @@ else CC_R_OPT = endif diff --git a/sources b/sources index f51e34f..a92d519 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -e1b609c699a2d8fdbbe242a2e3b7efcd otp_doc_html_R14B02.tar.gz -fc1c925e1195b6f851b1984da9ca0f6f otp_doc_man_R14B02.tar.gz -229fb8f193b09ac04a57a9d7794349b7 otp_src_R14B02.tar.gz +c9033bc35dbe4631dd2d14a6183b966a otp_doc_html_R14B03.tar.gz +357f54b174bb29d41fee97c063a47e8f otp_doc_man_R14B03.tar.gz +7979e662d11476b97c462feb7c132fb7 otp_src_R14B03.tar.gz