This commit was manufactured by cvs2git to create branch 'unlabeled-1.24.2'.

[packages/erlang.git] / erlang.spec

diff --git a/erlang.spec b/erlang.spec
index 8d31b08bb52bdecc865baceca3f2d44f039902ad..f8278985a740daebfb3262dddb328e0d3e393cad 100644 (file)
--- a/erlang.spec
+++ b/erlang.spec
@@ -1,23 +1,24 @@
 #
 # 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:       R10B_2
-Release:       0.1
+Version:       R10B_9
+Release:       1
 Epoch:         1
 License:       distributable
 Group:         Development/Languages
 %define                _version        %(echo %{version} | tr _ -)
 Source0:       http://www.erlang.org/download/otp_src_%{_version}.tar.gz
-# Source0-md5: 318f5e61872035290c5939c47631cd83
-Source1:       http://www.erlang.org/download/otp_doc_man_R10B-2.tar.gz
-# Source1-md5: c073820c7e97988aa9483618fe67aaf0
+# Source0-md5: 05791e9097f36202eb705df2a1db6500
+Source1:       http://www.erlang.org/download/otp_doc_man_R10B-9.tar.gz
+# Source1-md5: 051cd9893b36313f20a420bc2491905c
 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/
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
@@ -26,7 +27,14 @@ BuildRequires:       automake
 %{?with_java:BuildRequires:    /usr/bin/jar}
 BuildRequires: flex
 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/')
@@ -45,7 +53,7 @@ rozpowszechnianiu Erlanga poza Ericssonem.
 %setup -q -n otp_src_%{_version}
 %{__tar} xzf %{SOURCE1} man/ COPYRIGHT
 #%patch0 -p1
-#%patch1 -p1
+%patch1 -p1
 %patch2 -p1
 
 %build
@@ -59,6 +67,8 @@ cd ../gs
 %{__autoconf}
 cd ../megaco
 %{__autoconf}
+cd ../odbc
+%{__autoconf}
 cd ../snmp
 %{__autoconf}
 cd ../../erts/
@@ -67,8 +77,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