From 1386754913f1b66ade8b6abe4a8ca9a09cf4e721 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Jun 26 2012 11:29:32 +0000 Subject: Return back erl_interface private API headers (rhbz #818419) Signed-off-by: Peter Lemenkov --- diff --git a/erlang.spec b/erlang.spec index ee6fe0b..7a6f314 100644 --- a/erlang.spec +++ b/erlang.spec @@ -25,7 +25,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.3%{?dist} +Release: %{upstream_rel_for_rpm}.4%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -78,6 +78,9 @@ 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 Patch8: otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch +# Fedora specific patch +# Restore installation of a n internal erl_interface API +Patch9: otp-0009-Restore-installation-of-a-n-internal-erl_interface-A.patch # end of autogenerated patch tag list # BuildRoot not strictly needed since F10, but keep it for spec file robustness @@ -1001,6 +1004,7 @@ Erlang mode for XEmacs (source lisp files). %patch8 -p1 -b .Ugly_workaround_for_java_1_5_0_gcj_which_doesn_t_sup %endif %endif +%patch9 -p1 -b .Restore_installation_of_a_n_internal_erl_interface_A # end of autogenerated prep patch list # remove shipped zlib sources @@ -2389,6 +2393,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 26 2012 Peter Lemenkov - R15B-01.3 +- Return back erl_interface' private API headers (rhbz #818419) + * Fri Jun 15 2012 Dan HorĂ¡k +Date: Tue, 26 Jun 2012 15:16:39 +0400 +Subject: [PATCH] Restore installation of a n internal erl_interface API + headers + +See rhbz #818419 for the explanation why they're necessary for low-level +interaction with Erlang nodes: + +https://bugzilla.redhat.com/818419 + +Signed-off-by: Peter Lemenkov +--- + lib/erl_interface/src/Makefile.in | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in +index 91a2cc9..99ad8b7 100644 +--- a/lib/erl_interface/src/Makefile.in ++++ b/lib/erl_interface/src/Makefile.in +@@ -846,11 +846,29 @@ release: opt + $(INSTALL_DIR) $(RELSYSDIR)/include + $(INSTALL_DIR) $(RELSYSDIR)/lib + $(INSTALL_DIR) $(RELSYSDIR)/bin ++ $(INSTALL_DIR) $(RELSYSDIR)/src/auxdir ++ $(INSTALL_DIR) $(RELSYSDIR)/src/connect ++ $(INSTALL_DIR) $(RELSYSDIR)/src/decode ++ $(INSTALL_DIR) $(RELSYSDIR)/src/encode ++ $(INSTALL_DIR) $(RELSYSDIR)/src/epmd ++ $(INSTALL_DIR) $(RELSYSDIR)/src/legacy ++ $(INSTALL_DIR) $(RELSYSDIR)/src/misc ++ $(INSTALL_DIR) $(RELSYSDIR)/src/prog ++ $(INSTALL_DIR) $(RELSYSDIR)/src/registry + $(INSTALL_DATA) $(HEADERS) $(RELSYSDIR)/include + $(INSTALL_DATA) $(OBJ_TARGETS) $(RELSYSDIR)/lib + ifneq ($(EXE_TARGETS),) + $(INSTALL_PROGRAM) $(EXE_TARGETS) $(RELSYSDIR)/bin + endif ++ $(INSTALL_DATA) $(EXTRA) $(RELSYSDIR)/src ++ $(INSTALL_DATA) connect/*.h $(RELSYSDIR)/src/connect ++ $(INSTALL_DATA) decode/*.h $(RELSYSDIR)/src/decode ++ $(INSTALL_DATA) encode/*.h $(RELSYSDIR)/src/encode ++ $(INSTALL_DATA) epmd/*.h $(RELSYSDIR)/src/epmd ++ $(INSTALL_DATA) misc/*.h $(RELSYSDIR)/src/misc ++ $(INSTALL_DATA) registry/*.h $(RELSYSDIR)/src/registry ++ $(INSTALL_DATA) legacy/*.h $(RELSYSDIR)/src/legacy ++ $(INSTALL_DATA) prog/*.h $(RELSYSDIR)/src/prog + + release_docs: +