new release R12B-5

4 files changed, 50 insertions, 20 deletions

diff --git a/.cvsignore b/.cvsignore
index 4c8a7ee..d16b9d5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-otp_src_R12B-4.tar.gz
-otp_doc_html_R12B-4.tar.gz
-otp_doc_man_R12B-4.tar.gz
+otp_src_R12B-5.tar.gz
+otp_doc_html_R12B-5.tar.gz
+otp_doc_man_R12B-5.tar.gz
diff --git a/erlang.spec b/erlang.spec
index 9c15f19..9b1e7de 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -1,14 +1,17 @@
+%define ver R12B
+%define rel 5
+
 Name:           erlang
-Version:        R12B
-Release:        4.2%{?dist}
+Version:        %{ver}
+Release:        %{rel}.6%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
-License:        Erlang Public License
+License:        ERPL
 URL:            http://www.erlang.org
-Source:         http://www.erlang.org/download/otp_src_R12B-4.tar.gz
-Source1:	http://www.erlang.org/download/otp_doc_html_R12B-4.tar.gz
-Source2:	http://www.erlang.org/download/otp_doc_man_R12B-4.tar.gz
+Source:         http://www.erlang.org/download/otp_src_%{ver}-%{rel}.tar.gz
+Source1:	http://www.erlang.org/download/otp_doc_html_%{ver}-%{rel}.tar.gz
+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
@@ -43,15 +46,22 @@ Documentation for Erlang.
 
 
 %prep
-%setup -q -n otp_src_R12B-4
+%setup -q -n otp_src_%{ver}-%{rel}
 %patch0 -p1 -b .links
 %patch1 -p1 -b .install
 %patch2 -p1 -b .rpath
-%patch3 -p1 -b .sslrpath
+#%patch3 -p1 -b .sslrpath
 
 # enable dynamic linking for ssl
 sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure
 sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile
+# fix for newer glibc version
+sed -i 's|__GLIBC_MINOR__ <= 7|__GLIBC_MINOR__ <= 8|' erts/emulator/hipe/hipe_x86_signal.c
+# use gcc -shared instead of ld
+sed -i 's|@RX_LD@|gcc -shared|' lib/common_test/c_src/Makefile.in
+sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in
+
+
 
 %build
 %ifarch sparcv9 sparc64
@@ -82,7 +92,7 @@ tar -C $RPM_BUILD_ROOT/%{_libdir}/erlang -zxf %{SOURCE2}
 # make links to binaries
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 cd $RPM_BUILD_ROOT/%{_bindir}
-for file in erl erlc 
+for file in erl erlc escript dialyzer
 do
   ln -sf ../%{_lib}/erlang/bin/$file .
 done
@@ -113,7 +123,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Feb 14 2009 Dennis Gilmore <dennis@ausil.us> - R12B-4.2
+* Sun Mar  1 2009 Gerard Milmeister <gemi@bluewin.ch> - R12B-5.6
+- new release R12B-5
+- link escript and dialyzer to %{_bindir}
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - R12B-5.5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Feb 14 2009 Dennis Gilmore <dennis@ausil.us> - R12B-4.5
 - fix sparc arches to compile
 
 * Sat Oct 25 2008 Gerard Milmeister <gemi@bluewin.ch> - R12B-4.1
diff --git a/otp-sslrpath.patch b/otp-sslrpath.patch
index 83ba120..d53909a 100644
--- a/otp-sslrpath.patch
+++ b/otp-sslrpath.patch
@@ -1,7 +1,8 @@
---- otp_src_R10B-9/lib/ssl/c_src/Makefile.in.sslrpath	2005-12-29 00:49:17.000000000 +0100
-+++ otp_src_R10B-9/lib/ssl/c_src/Makefile.in	2005-12-29 00:50:15.000000000 +0100
-@@ -95,7 +95,7 @@
- endif
+diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in
+--- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath	2008-10-26 00:00:37.000000000 +0200
++++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in	2008-10-26 00:01:09.000000000 +0200
+@@ -102,7 +102,7 @@ else
+ SSL_MAKEFILE =
  endif
  
 -CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@
@@ -9,3 +10,15 @@
  ifeq ($(findstring @,$(CC_R_FLAG)),@)
  # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@;
  # we try our best here instead...
+@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar
+ CC_R_FLAG =
+ else
+ ifeq ($(findstring osf,$(TARGET)),osf)		# osf1: -Wl,-rpath,
+-CC_R_FLAG = -Wl,-rpath,
++CC_R_FLAG =
+ else						# Default: -Wl,-R
+-CC_R_FLAG = -Wl,-R
++CC_R_FLAG =
+ endif
+ endif
+ endif
diff --git a/sources b/sources
index 7e171fb..6f16b51 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-ae81edda4a17506af7a9d73abca033b2  otp_src_R12B-4.tar.gz
-f633cd418d8260af7a11c998aa88072b  otp_doc_html_R12B-4.tar.gz
-ef8f96d1721a2345cc87b208cde3de06  otp_doc_man_R12B-4.tar.gz
+3751ea3fea669d2b25c67eeb883734bb  otp_src_R12B-5.tar.gz
+fb0c5454bbd865e881b6712295f6d41f  otp_doc_html_R12B-5.tar.gz
+6231cb172847040395cc34b20781aa3b  otp_doc_man_R12B-5.tar.gz