- Update to R13B-02 (patched for what's released as 02-1 by upstream)

3 files changed, 35 insertions, 7 deletions

diff --git a/erlang.spec b/erlang.spec
index 16271e3..ee05dd6 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -1,9 +1,9 @@
 %define ver R13B
-%define rel 01
+%define rel 02
 
 Name:           erlang
 Version:        %{ver}
-Release:        %{rel}.2%{?dist}
+Release:        %{rel}.1%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
@@ -15,6 +15,9 @@ Source2:        http://www.erlang.org/download/otp_doc_man_%{ver}%{rel}.tar.gz
 Patch0:         otp-links.patch
 Patch1:         otp-install.patch
 Patch2:         otp-rpath.patch
+# OTP-8199 In the new release of Reltool (0.5) there is a severe bug that may cause your source files to be deleted. 
+# http://www.erlang.org/download/patches/otp_src_R13B02_OTP-8199.readme
+Patch3:         http://www.erlang.org/download/patches/otp_src_R13B02_OTP-8199.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ncurses-devel
@@ -50,6 +53,7 @@ Documentation for Erlang.
 %patch0 -p1 -b .links
 %patch1 -p1 -b .install
 %patch2 -p1 -b .rpath
+%patch3 -p1 -b .OTP-8199
 
 # enable dynamic linking for ssl
 sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure
@@ -123,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 22 2009 Lubomir Rintel (Good Data) <lubo.rintel@gooddata.com> - R13B-02-1
+- Update to R13B-02 (patched for what's released as 02-1 by upstream)
+
 * Tue Aug 25 2009 Tomas Mraz <tmraz@redhat.com> - R13B-01.2
 - rebuilt with new openssl
 
diff --git a/otp-install.patch b/otp-install.patch
index 68066c7..147199b 100644
--- a/otp-install.patch
+++ b/otp-install.patch
@@ -1,15 +1,16 @@
---- otp_src_R9C-0/erts/etc/unix/Install.src.install	2003-10-17 12:52:14.000000000 +0200
-+++ otp_src_R9C-0/erts/etc/unix/Install.src	2003-10-17 14:26:49.000000000 +0200
-@@ -84,7 +84,7 @@
+diff -up otp_src_R13B02/erts/etc/unix/Install.src.install otp_src_R13B02/erts/etc/unix/Install.src
+--- otp_src_R13B02/erts/etc/unix/Install.src.install	2009-09-18 16:07:12.000000000 +0200
++++ otp_src_R13B02/erts/etc/unix/Install.src	2009-10-22 15:49:01.000000000 +0200
+@@ -111,7 +111,7 @@ if [ -h epmd ]; then
    /bin/rm -f epmd
  fi
  
--ln -s $ERL_ROOT/erts-%I_VSN%/bin/epmd epmd
+-ln -s $TARGET_ERL_ROOT/erts-%I_VSN%/bin/epmd epmd
 +ln -s ../erts-%I_VSN%/bin/epmd epmd
  
  cp -p $ERL_ROOT/erts-%I_VSN%/bin/run_erl .
  cp -p $ERL_ROOT/erts-%I_VSN%/bin/to_erl .
-@@ -145,16 +145,4 @@
+@@ -160,16 +160,4 @@ if [ "X$TARGET" != "Xsunos5" -a -d $ERL_
  	(ranlib $library) > /dev/null 2>&1
      done
  fi
diff --git a/otp_src_R13B02_OTP-8199.patch b/otp_src_R13B02_OTP-8199.patch
new file mode 100644
index 0000000..ca653df
--- /dev/null
+++ b/otp_src_R13B02_OTP-8199.patch
@@ -0,0 +1,20 @@
+--- otp_src_R13B02/lib/reltool/src/reltool_target.erl	2009-09-18 16:25:49.000000000 +0200
++++ otp_src_R13B02_patched/lib/reltool/src/reltool_target.erl	2009-09-22 17:45:33.000000000 +0200
+@@ -1014,7 +1014,7 @@
+     TargetDir2 = filename:join([TargetDir, Dir]),
+     cleanup_spec(Files, TargetDir2),
+     file:del_dir(TargetDir2);
+-cleanup_spec({create_dir, _OldDir, NewDir, Files}, TargetDir) ->
++cleanup_spec({create_dir, NewDir, _OldDir, Files}, TargetDir) ->
+     TargetDir2 = filename:join([TargetDir, NewDir]),
+     cleanup_spec(Files, TargetDir2),
+     file:del_dir(TargetDir2);
+@@ -1152,7 +1152,7 @@
+ 			       "Progname=erl\r\n",
+ 			       "Rootdir=", NativeRootDir, "\r\n"],
+ 		    IniFile = filename:join([BinDir, "erl.ini"]),
+-                    file:write(IniFile, IniData);
++                    ok = file:write_file(IniFile, IniData);
+ 		_ ->
+ 		    subst_src_scripts(start_scripts(), ErtsBinDir, BinDir, 
+ 				      [{"FINAL_ROOTDIR", TargetDir2}, {"EMU", "beam"}],