ver. R12B-5 (bugfix release)

6 files changed, 97 insertions, 18 deletions

diff --git a/.cvsignore b/.cvsignore
index 40fd7e4..34a6285 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-otp_doc_html_R12B-3.tar.gz
-otp_doc_man_R12B-3.tar.gz
-otp_src_R12B-3.tar.gz
+otp_doc_html_R12B-5.tar.gz
+otp_doc_man_R12B-5.tar.gz
+otp_src_R12B-5.tar.gz
diff --git a/erlang.spec b/erlang.spec
index 919d51f..f13561c 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -1,9 +1,9 @@
 %define ver R12B
-%define rel 3
+%define rel 5
 
 Name:           erlang
 Version:        %{ver}
-Release:        %{rel}.3%{?dist}
+Release:        %{rel}.6%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
@@ -14,6 +14,7 @@ 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
 Patch6:         otp-ssl_missing_libs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,13 +25,17 @@ BuildRequires:  unixODBC-devel
 BuildRequires:	tcl-devel
 BuildRequires:	tk-devel
 BuildRequires:  gd-devel
+%if 0%{?rhel}
 BuildRequires:	java-1.4.2-gcj-compat-devel
+%else
+BuildRequires:	java-1.5.0-gcj-devel
+%endif
 BuildRequires:  flex
 BuildRequires:	m4
 
 Requires:	tk
 
-%description 
+%description
 Erlang is a general-purpose programming language and runtime
 environment. Erlang has built-in support for concurrency, distribution
 and fault tolerance. Erlang is used in several large telecommunication
@@ -49,7 +54,8 @@ Documentation for Erlang.
 %setup -q -n otp_src_%{ver}-%{rel}
 %patch0 -p1 -b .links
 %patch1 -p1 -b .install
-%patch3 -p1 -b .sslrpath
+%patch2 -p1 -b .rpath
+#%patch3 -p1 -b .sslrpath
 %patch6 -p0 -b .keyutils
 
 # enable dynamic linking for ssl
@@ -64,7 +70,11 @@ sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in
 
 
 %build
-CFLAGS="-fno-strict-aliasing" ./configure --enable-dynamic-ssl-lib --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
+%ifarch sparcv9 sparc64
+CFLAGS="-mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
+%else
+CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
+%endif
 chmod -R u+w .
 make
 
@@ -88,7 +98,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
@@ -119,8 +129,24 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Aug 11 2008 Peter Lemenkov <lemenkov@gmail.com> - R12B-3.3
-- Force dynamic linking of crypto libs
+* 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
+
+* Fri Jan 16 2009 Tomas Mraz <tmraz@redhat.com> - R12B-4.4
+- rebuild with new openssl
+
+* Sat Oct 25 2008 Gerard Milmeister <gemi@bluewin.ch> - R12B-4.1
+- new release R12B-4
+
+* Fri Sep  5 2008 Gerard Milmeister <gemi@bluewin.ch> - R12B-3.3
+- fixed sslrpath patch
 
 * Thu Jul 17 2008 Tom "spot" Callaway <tcallawa@redhat.com> - R12B-3.2
 - fix license tag
diff --git a/import.log b/import.log
index bca9e59..c740ecb 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,2 @@
 erlang-R12B-3_2_fc9:EL-5:erlang-R12B-3.2.fc9.src.rpm:1218402033
+erlang-R12B-5_6_fc10:EL-5:erlang-R12B-5.6.fc10.src.rpm:1240063042
diff --git a/otp-rpath.patch b/otp-rpath.patch
new file mode 100644
index 0000000..95d38d2
--- /dev/null
+++ b/otp-rpath.patch
@@ -0,0 +1,39 @@
+diff -up otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath otp_src_R12B-4/lib/crypto/c_src/Makefile.in
+--- otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath	2008-10-25 22:20:42.000000000 +0200
++++ otp_src_R12B-4/lib/crypto/c_src/Makefile.in	2008-10-25 22:20:59.000000000 +0200
+@@ -80,7 +80,7 @@ ifeq ($(HOST_OS),)
+ HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess)
+ endif
+ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
+-LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@
++LD_R_FLAG=
+ ifeq ($(strip $(LD_R_FLAG)),)
+ LD_R_OPT =
+ else
+diff -up otp_src_R12B-4/lib/crypto/priv/Makefile.rpath otp_src_R12B-4/lib/crypto/priv/Makefile
+--- otp_src_R12B-4/lib/crypto/priv/Makefile.rpath	2008-10-25 22:21:11.000000000 +0200
++++ otp_src_R12B-4/lib/crypto/priv/Makefile	2008-10-25 22:21:33.000000000 +0200
+@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o
+ # ----------------------------------------------------
+ 
+ $(SO_DRIVER): $(OBJS)
+-	$(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \
++	$(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \
+ 	-o $@ $^ -lcrypto
+ 
+ $(DLL_DRIVER): $(OBJS)
+diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in
+--- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath	2008-10-25 22:21:51.000000000 +0200
++++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in	2008-10-25 22:22:21.000000000 +0200
+@@ -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/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 c7aff56..0b15f23 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-8865d406c256abbff63eaff62d2216aa  otp_doc_html_R12B-3.tar.gz
-13098954c9d5804bb8394fe7badb3d0d  otp_doc_man_R12B-3.tar.gz
-c2e7f0ad54b8fadebde2d94106608d97  otp_src_R12B-3.tar.gz
+fb0c5454bbd865e881b6712295f6d41f  otp_doc_html_R12B-5.tar.gz
+6231cb172847040395cc34b20781aa3b  otp_doc_man_R12B-5.tar.gz
+3751ea3fea669d2b25c67eeb883734bb  otp_src_R12B-5.tar.gz