new release R12B-3

3 files changed, 27 insertions, 15 deletions

diff --git a/.cvsignore b/.cvsignore
index 750bfae..40fd7e4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-otp_src_R12B-1.tar.gz
-otp_doc_man_R12B-1.tar.gz
-otp_doc_html_R12B-1.tar.gz
+otp_doc_html_R12B-3.tar.gz
+otp_doc_man_R12B-3.tar.gz
+otp_src_R12B-3.tar.gz
diff --git a/erlang.spec b/erlang.spec
index a37a4d1..a032924 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -1,19 +1,21 @@
+%define ver R12B
+%define rel 3
+
 Name:           erlang
-Version:        R12B
-Release:        1.1%{?dist}
+Version:        %{ver}
+Release:        %{rel}.1%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
 License:        Erlang Public License
 URL:            http://www.erlang.org
-Source:         http://www.erlang.org/download/otp_src_R12B-1.tar.gz
-Source1:	http://www.erlang.org/download/otp_doc_html_R12B-1.tar.gz
-Source2:	http://www.erlang.org/download/otp_doc_man_R12B-1.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
 Patch3:         otp-sslrpath.patch
-Patch4:         otp-null.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ncurses-devel
@@ -44,15 +46,22 @@ Documentation for Erlang.
 
 
 %prep
-%setup -q -n otp_src_R12B-1
+%setup -q -n otp_src_%{ver}-%{rel}
 %patch0 -p1 -b .links
 %patch1 -p1 -b .install
-%patch2 -p1 -b .rpath
+#%patch2 -p1 -b .rpath
 %patch3 -p1 -b .sslrpath
-%patch4 -p1 -b .null
+
 # 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
 CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
@@ -110,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul  6 2008 Gerard Milmeister <gemi@bluewin.ch> - R12B-3.1
+- new release R12B-3
+
 * Thu Mar 27 2008 Gerard Milmeister <gemi@bluewin.ch> - R12B-1.1
 - new release R12B-1
 
diff --git a/sources b/sources
index 0c7d74f..c7aff56 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-6de3630b446e9c2150edfe01e383c917  otp_src_R12B-1.tar.gz
-96da62bcfb40e5d3ec2945bb2b050024  otp_doc_man_R12B-1.tar.gz
-3dd8aee17fcbd3e5fda7313208fce6ac  otp_doc_html_R12B-1.tar.gz
+8865d406c256abbff63eaff62d2216aa  otp_doc_html_R12B-3.tar.gz
+13098954c9d5804bb8394fe7badb3d0d  otp_doc_man_R12B-3.tar.gz
+c2e7f0ad54b8fadebde2d94106608d97  otp_src_R12B-3.tar.gz