X-Git-Url: http://git.pld-linux.org/?p=packages%2Ferlang.git;a=blobdiff_plain;f=erlang.spec;h=3f4affc8fdd71a380e39fffa77ed9fbbbee60179;hp=990603f013602d2c28479a794c45123d01bc6ab3;hb=fc6fa45cbcb09ad880fc66a4092936ce442271ef;hpb=7c6db17bacda52627b34e81117bad056bd01681b

diff --git a/erlang.spec b/erlang.spec
index 990603f..3f4affc 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -1,34 +1,45 @@
+# NOTE: Building requires working DNS setup. Build may hang
+#       even if _only_ first dns specified in resolv.conf
+#       is unreachable.
 #
 # Conditional build:
 %bcond_with	java		# with Java support
-# 
+%bcond_without	odbc		# without unixODBC support
+#
 Summary:	OpenSource Erlang/OTP
 Summary(pl):	Erlang/OTP z otwartymi ¼ród³ami
 Name:		erlang
-Version:	R9C_2
-Release:	3
+Version:	R10B_10
+Release:	1
 Epoch:		1
+%define		_version	%(echo %{version} | tr _ -)
 License:	distributable
 Group:		Development/Languages
-%define		_version	%(echo %{version} | tr _ -)
 Source0:	http://www.erlang.org/download/otp_src_%{_version}.tar.gz
-# Source0-md5:	3cdb1c58671995d6b334e0f8da414816
-Source1:	http://www.erlang.org/download/otp_man_R9C-0.tar.gz
-# Source1-md5:	f94bbaba800cc73e67704b92df5aab60
+# Source0-md5:	c1405c885f07d661b7362b822d571586
+Source1:	http://www.erlang.org/download/otp_doc_man_R10B-10.tar.gz
+# Source1-md5:	207e00bcaf5a9428bd86e3973f9b699f
 Patch0:		%{name}-fPIC.patch
-Patch1:		%{name}-ssl_timeout.patch
-Patch2:		%{name}-optional_java.patch
+Patch1:		%{name}-optional_java.patch
+Patch2:		%{name}-hipe_optimistic_regalloc_once_only.patch
 URL:		http://www.erlang.org/
+%{?with_java:BuildRequires:	/usr/bin/jar}
 BuildRequires:	XFree86-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-%{?with_java:BuildRequires:	jdk >= 1.2}
-%{?with_java:BuildRequires:	/usr/bin/jar}
 BuildRequires:	flex
+%{?with_java:BuildRequires:	jdk >= 1.2}
 BuildRequires:	ncurses-devel
+BuildRequires:	openssl-devel >= 0.9.7
+Buildrequires:	openssl-tools
 BuildRequires:	perl-base
+%if %{with odbc}
+BuildRequires:	unixODBC-devel
+%else
+BuildConflicts:	unixODBC-devel
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-	
+
 %define _erl_target %(echo %{_build} | sed -e's/amd64/x86_64/;s/athlon/i686/;s/ppc/powerpc/')
 
 %description
@@ -44,7 +55,7 @@ rozpowszechnianiu Erlanga poza Ericssonem.
 %prep
 %setup -q -n otp_src_%{_version}
 %{__tar} xzf %{SOURCE1} man/ COPYRIGHT
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 
@@ -59,6 +70,8 @@ cd ../gs
 %{__autoconf}
 cd ../megaco
 %{__autoconf}
+cd ../odbc
+%{__autoconf}
 cd ../snmp
 %{__autoconf}
 cd ../../erts/
@@ -67,8 +80,9 @@ cd ..
 %configure \
 	--with%{!?with_java:out}-java
 ERL_TOP=`pwd`; export ERL_TOP
-%{__make} \
-	TARGET="%{_erl_target}"
+LD_ASSUME_KERNEL=2.4.19 %{__make} \
+	TARGET="%{_erl_target}" \
+	|| { find . -name erl_crash.dump | xargs cat ; exit 1 ; }
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -103,12 +117,15 @@ find $RPM_BUILD_ROOT%{_libdir}/%{name}/lib -type f -perm -500 \
 find $RPM_BUILD_ROOT%{_libdir}/%{name}/lib -type f '!' -perm -500 \
 	| sed -e"s#^$RPM_BUILD_ROOT%{_libdir}/%{name}/#%%{_libdir}/%%{name}/#" >> lib.list
 
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/erts-*/lib/internal
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/erts-*/include/internal
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f lib.list
 %defattr(644,root,root,755)
-%doc AUTHORS EPLICENCE README erts/notes.html COPYRIGHT
+%doc AUTHORS EPLICENCE README COPYRIGHT
 %attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/erlang
 %dir %{_libdir}/%{name}/bin
@@ -124,7 +141,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/erts-*/doc
 %{_libdir}/%{name}/erts-*/man
 %{_libdir}/%{name}/erts-*/src
-%{_libdir}/%{name}/erts-*/*.ear
+%{_libdir}/%{name}/erts-*/include
+#%{_libdir}/%{name}/erts-*/*.ear
 %dir %{_libdir}/%{name}/erts-*/bin
 %attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/beam*
 %attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/child*