X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=erlang.spec;h=24d2c936e18502616a463951ed6d41cf749e39c6;hb=daa5c507414a0b62fb722088859af20874819f94;hp=d6c66b75e5b391dc4eec31058e9134091ca56d59;hpb=52fa868e21b7dbdb76ec161e6f045075337f9544;p=packages%2Ferlang.git

diff --git a/erlang.spec b/erlang.spec
index d6c66b7..24d2c93 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -1,45 +1,61 @@
+# NOTE: Building requires working DNS setup. Build may hang
+#       even if _only_ first dns specified in resolv.conf
+#       is unreachable.
+# TODO
+# - separate -devel (at least header files!)
+# - modularize (odbc, etc)
+# - manuals to %{_mandir}
+# - investigate fPIC.patch
 #
 # 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
+Summary(pl.UTF-8):	Erlang/OTP z otwartymi źródłami
 Name:		erlang
-Version:	R10B_6
-Release:	0.1
+# keep stable line, currently R14
+Version:	R14A
+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:	6463f70b40e2a6c3587e54653add8414
-Source1:	http://www.erlang.org/download/otp_doc_man_R10B-6.tar.gz
-# Source1-md5:	0243d2ff01fb2bac03115bcbe2284b20
+# Source0-md5:	a24873bbace9ab3c307f3d2492d9e134
+Source1:	http://www.erlang.org/download/otp_doc_man_%{_version}.tar.gz
+# Source1-md5:	b57a7846818ad144b1b6ecc0a54de2ae
 Patch0:		%{name}-fPIC.patch
-Patch1:		%{name}-optional_java.patch
+Patch1:		%{name}-tinfo.patch
+Patch2:		%{name}-link.patch
 URL:		http://www.erlang.org/
-BuildRequires:	XFree86-devel
+%{?with_java:BuildRequires:	/usr/bin/jar}
+BuildRequires:	xorg-lib-libX11-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:	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/')
+
+%define _erl_target %(echo %{_build}-gnu | sed -e's/amd64/x86_64/;s/athlon/i686/;s/ppc/powerpc/')
 
 %description
 Erlang is a programming language designed at the Ericsson Computer
 Science Laboratory. Open-source Erlang is being released to help
 encourage the spread of Erlang outside Ericsson.
 
-%description -l pl
-Erlang to jêzyk programowania opracowany w Ericsson Computer Science
-Laboratory. Open-source Erlang zosta³ wydany, aby pomóc w
+%description -l pl.UTF-8
+Erlang to język programowania opracowany w Ericsson Computer Science
+Laboratory. Open-source Erlang został wydany, aby pomóc w
 rozpowszechnianiu Erlanga poza Ericssonem.
 
 %prep
@@ -47,6 +63,7 @@ rozpowszechnianiu Erlanga poza Ericssonem.
 %{__tar} xzf %{SOURCE1} man/ COPYRIGHT
 #%patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 find . -name config.sub | xargs -n 1 cp -f /usr/share/automake/config.sub
@@ -67,15 +84,20 @@ cd ../../erts/
 %{__autoconf}
 cd ..
 %configure \
-	--with%{!?with_java:out}-java
+%ifarch sparc
+	CFLAGS="%{rpmcflags} -mv8plus" \
+%endif
+	--with%{!?with_java:out}-javac
+rm -f lib/ssl/SKIP
 ERL_TOP=`pwd`; export ERL_TOP
-%{__make} \
-	TARGET="%{_erl_target}"
+ %{__make} -j1 \
+	TARGET="%{_erl_target}" \
+	|| { find . -name erl_crash.dump | xargs cat ; exit 1 ; }
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -j1 install \
 	TARGET="%{_erl_target}" \
 	INSTALL_PREFIX=$RPM_BUILD_ROOT
 
@@ -84,11 +106,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/erts-*/*.html
 sed -i -e"s#$RPM_BUILD_ROOT##" \
 	$RPM_BUILD_ROOT%{_libdir}/%{name}/bin/{erl,start,start_erl}
 
-for l in erl erlc ; do
+for l in erl erlc escript dialyzer epmd run_erl to_erl typer; do
 	ln -sf %{_libdir}/%{name}/bin/$l $RPM_BUILD_ROOT%{_bindir}
 done
 ERTSDIR=`echo $RPM_BUILD_ROOT%{_libdir}/%{name}/erts-* | sed -e"s#^$RPM_BUILD_ROOT##"`
-for l in ear ecc elink escript ; do
+for l in epmd ; do
 	ln -sf $ERTSDIR/bin/$l $RPM_BUILD_ROOT%{_bindir}
 done
 ln -sf $ERTSDIR/bin/epmd $RPM_BUILD_ROOT%{_libdir}/%{name}/bin
@@ -105,7 +127,7 @@ 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-*/lib
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/erts-*/include/internal
 
 %clean
@@ -113,17 +135,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f lib.list
 %defattr(644,root,root,755)
-%doc AUTHORS EPLICENCE README COPYRIGHT
+%doc AUTHORS EPLICENCE COPYRIGHT
 %attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/erlang
 %dir %{_libdir}/%{name}/bin
+%attr(755,root,root) %{_libdir}/%{name}/bin/dialyzer
 %attr(755,root,root) %{_libdir}/%{name}/bin/epmd
 %attr(755,root,root) %{_libdir}/%{name}/bin/erl
 %attr(755,root,root) %{_libdir}/%{name}/bin/erlc
+%attr(755,root,root) %{_libdir}/%{name}/bin/escript
 %attr(755,root,root) %{_libdir}/%{name}/bin/run_erl
 %attr(755,root,root) %{_libdir}/%{name}/bin/start
 %attr(755,root,root) %{_libdir}/%{name}/bin/start_erl
 %attr(755,root,root) %{_libdir}/%{name}/bin/to_erl
+%attr(755,root,root) %{_libdir}/%{name}/bin/typer
 %{_libdir}/%{name}/bin/start*.*
 %dir %{_libdir}/%{name}/erts-*
 %{_libdir}/%{name}/erts-*/doc
@@ -134,12 +159,15 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}/erts-*/bin
 %attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/beam*
 %attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/child*
+%attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/dialyzer
+%attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/dyn_erl
 %attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/e*
 %attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/heart*
 %attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/inet_gethost
 %attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/run_erl
 %attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/start
 %attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/to_erl
+%attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/typer
 %{_libdir}/%{name}/erts-*/bin/start*.*
 # (file list dynamically generated) %{_libdir}/%{name}/lib
 %dir %{_libdir}/%{name}/misc