From 0ba7416904c8c29010ad689cce13396a1d6ffcf3 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Dec 25 2012 12:31:05 +0000
Subject: Run make clean before build (to remove pre-built files)


Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

---

diff --git a/erlang.spec b/erlang.spec
index af33811..a897a47 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -25,7 +25,7 @@
 
 Name:		erlang
 Version:	%{upstream_ver}
-Release:	%{upstream_rel_for_rpm}.1%{?dist}
+Release:	%{upstream_rel_for_rpm}.2%{?dist}
 Summary:	General-purpose programming language and runtime environment
 
 Group:		Development/Languages
@@ -1029,9 +1029,8 @@ CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enabl
 CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib
 %endif
 
-# FIXME remove pre-built BEAM files
-# some of them are required for compilation
-#find ./lib -type f -name "*.beam" -delete
+# Remove pre-built BEAM files
+make clean
 
 # GNU Emacs/XEmacs related stuff
 erlang_tools_vsn="$(sed -n 's/TOOLS_VSN = //p' lib/tools/vsn.mk)"
@@ -2338,6 +2337,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 25 2012 Peter Lemenkov <lemenkov@gmail.com> - R15B-03.2
+- Run make clean before build (to remove pre-built files)
+
 * Fri Dec 21 2012 Peter Lemenkov <lemenkov@gmail.com> - R15B-03.1
 - Ver. R15B03 (actually R15B03-1)
 
diff --git a/otp-0007-Do-not-install-erlang-sources.patch b/otp-0007-Do-not-install-erlang-sources.patch
index 457c781..399a5dd 100644
--- a/otp-0007-Do-not-install-erlang-sources.patch
+++ b/otp-0007-Do-not-install-erlang-sources.patch
@@ -55,13 +55,14 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
  lib/mnesia/src/Makefile            | 2 +-
  lib/observer/src/Makefile          | 1 -
  lib/odbc/src/Makefile              | 2 +-
- lib/orber/COSS/CosNaming/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/asn1/Makefile       | 4 ++--
  lib/public_key/src/Makefile        | 4 ----
  lib/reltool/src/Makefile           | 2 +-
  lib/runtime_tools/src/Makefile     | 2 --
@@ -83,7 +84,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 +---
- 76 files changed, 57 insertions(+), 112 deletions(-)
+ 77 files changed, 60 insertions(+), 115 deletions(-)
 
 diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile
 index 5bcc2eb..c87dc9e 100644
@@ -731,18 +732,20 @@ index 2af65cc..2358d16 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 769c08a..9906247 100644
+index 769c08a..cfc56b3 100644
 --- a/lib/orber/COSS/CosNaming/Makefile
 +++ b/lib/orber/COSS/CosNaming/Makefile
-@@ -144,7 +144,7 @@ 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"
 -	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming"
+-	$(INSTALL_DATA) $(GEN_FILES) "$(RELSYSDIR)/COSS/CosNaming"
 +	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming"
- 	$(INSTALL_DATA) $(GEN_FILES) "$(RELSYSDIR)/COSS/CosNaming"
++	$(INSTALL_DATA) $(GEN_HRL_FILES) $(GEN_EXT_HRL_FILES) "$(RELSYSDIR)/COSS/CosNaming"
  
  
+ release_docs_spec:
 diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile
 index 72610de..a800d2f 100644
 --- a/lib/orber/src/Makefile
@@ -820,6 +823,21 @@ index fa01fe7..5197f4b 100644
  	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin"
  
+diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile
+index 957c332..26d9420 100644
+--- a/lib/public_key/asn1/Makefile
++++ b/lib/public_key/asn1/Makefile
+@@ -95,8 +95,8 @@ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/asn1"
+-	$(INSTALL_DATA) $(ASN_ASNS) $(ASN_ERLS) $(ASN_HRLS) $(ASN_CONFIGS) \
+-		 $(GEN_ERLS) "$(RELSYSDIR)/asn1"
++	$(INSTALL_DATA) $(ASN_ASNS) $(ASN_HRLS) $(ASN_CONFIGS) \
++		 "$(RELSYSDIR)/asn1"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 
 diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile
 index d5cd13d..d2a35f8 100644
 --- a/lib/public_key/src/Makefile