X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=erlang.spec;h=f8278985a740daebfb3262dddb328e0d3e393cad;hb=412fbe685e10ee259f0b036a3044d01eba145abf;hp=af0ca7745faa00be3d01869b75da2b3c56567e73;hpb=3685cbd210abc69dffd6d615b098b5fae7f966a2;p=packages%2Ferlang.git

diff --git a/erlang.spec b/erlang.spec
index af0ca77..f827898 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -1,19 +1,43 @@
+#
+# 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:		otp
-Version:	R9C_2
-Release:	0.1
+Name:		erlang
+Version:	R10B_9
+Release:	1
 Epoch:		1
 License:	distributable
 Group:		Development/Languages
 %define		_version	%(echo %{version} | tr _ -)
-Source0:	http://www.erlang.org/download/%{name}_src_%{_version}.tar.gz
+Source0:	http://www.erlang.org/download/otp_src_%{_version}.tar.gz
+# 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}-optional_java.patch
+Patch2:		%{name}-hipe_optimistic_regalloc_once_only.patch
 URL:		http://www.erlang.org/
 BuildRequires:	XFree86-devel
 BuildRequires:	autoconf
+BuildRequires:	automake
+%{?with_java:BuildRequires:	jdk >= 1.2}
+%{?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/')
 
 %description
 Erlang is a programming language designed at the Ericsson Computer
@@ -26,9 +50,14 @@ Laboratory. Open-source Erlang zosta
 rozpowszechnianiu Erlanga poza Ericssonem.
 
 %prep
-%setup -q -n %{name}_src_%{_version}
+%setup -q -n otp_src_%{_version}
+%{__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
 %{__autoconf}
 cd lib
 %{__autoconf}
@@ -38,70 +67,93 @@ cd ../gs
 %{__autoconf}
 cd ../megaco
 %{__autoconf}
+cd ../odbc
+%{__autoconf}
 cd ../snmp
 %{__autoconf}
 cd ../../erts/
 %{__autoconf}
 cd ..
-%configure
+%configure \
+	--with%{!?with_java:out}-java
 ERL_TOP=`pwd`; export ERL_TOP
-%{__make} \
-	TARGET="%{_build}"
+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
 
 %{__make} install \
-	TARGET="%{_build}" \
+	TARGET="%{_erl_target}" \
 	INSTALL_PREFIX=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/*.html
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/erts-*/*.html
 
 sed -i -e"s#$RPM_BUILD_ROOT##" \
-	$RPM_BUILD_ROOT%{_libdir}/erlang/bin/{erl,start,start_erl}
+	$RPM_BUILD_ROOT%{_libdir}/%{name}/bin/{erl,start,start_erl}
 
 for l in erl erlc ; do
-	ln -sf %{_libdir}/erlang/bin/$l $RPM_BUILD_ROOT%{_bindir}
+	ln -sf %{_libdir}/%{name}/bin/$l $RPM_BUILD_ROOT%{_bindir}
 done
-ERTSDIR=`echo $RPM_BUILD_ROOT%{_libdir}/erlang/erts-* | sed -e"s#^$RPM_BUILD_ROOT##"`
+ERTSDIR=`echo $RPM_BUILD_ROOT%{_libdir}/%{name}/erts-* | sed -e"s#^$RPM_BUILD_ROOT##"`
 for l in ear ecc elink escript ; do
 	ln -sf $ERTSDIR/bin/$l $RPM_BUILD_ROOT%{_bindir}
 done
-ln -sf $ERTSDIR/bin/epmd $RPM_BUILD_ROOT%{_libdir}/erlang/bin
+ln -sf $ERTSDIR/bin/epmd $RPM_BUILD_ROOT%{_libdir}/%{name}/bin
+
+cp -r man $RPM_BUILD_ROOT%{_libdir}/%{name}
+find $RPM_BUILD_ROOT%{_libdir}/%{name}/man -type f | xargs gzip -9
+
+# some files in the library need +x, so we build the list here
+echo "%%defattr(644,root,root,755)" > lib.list
+find $RPM_BUILD_ROOT%{_libdir}/%{name}/lib -type d \
+	| sed -e"s#^$RPM_BUILD_ROOT%{_libdir}/%{name}/#%%dir %%{_libdir}/%%{name}/#" >> lib.list
+find $RPM_BUILD_ROOT%{_libdir}/%{name}/lib -type f -perm -500 \
+	| sed -e"s#^$RPM_BUILD_ROOT%{_libdir}/%{name}/#%%attr(755,root,root) %%{_libdir}/%%{name}/#" >> lib.list
+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
+%files -f lib.list
 %defattr(644,root,root,755)
-%doc AUTHORS EPLICENCE README erts/notes.html
+%doc AUTHORS EPLICENCE README COPYRIGHT
 %attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/erlang
-%attr(755,root,root) %{_libdir}/erlang/bin/epmd
-%attr(755,root,root) %{_libdir}/erlang/bin/erl
-%attr(755,root,root) %{_libdir}/erlang/bin/erlc
-%attr(755,root,root) %{_libdir}/erlang/bin/run_erl
-%attr(755,root,root) %{_libdir}/erlang/bin/start
-%attr(755,root,root) %{_libdir}/erlang/bin/start_erl
-%attr(755,root,root) %{_libdir}/erlang/bin/to_erl
-%{_libdir}/erlang/bin/start*.*
-%dir %{_libdir}/erlang/erts-*
-%{_libdir}/erlang/erts-*/doc
-%{_libdir}/erlang/erts-*/man
-%{_libdir}/erlang/erts-*/src
-%{_libdir}/erlang/erts-*/*.ear
-%attr(755,root,root) %{_libdir}/erlang/erts-*/bin/beam*
-%attr(755,root,root) %{_libdir}/erlang/erts-*/bin/child*
-%attr(755,root,root) %{_libdir}/erlang/erts-*/bin/e*
-%attr(755,root,root) %{_libdir}/erlang/erts-*/bin/heart*
-%attr(755,root,root) %{_libdir}/erlang/erts-*/bin/inet_gethost
-%attr(755,root,root) %{_libdir}/erlang/erts-*/bin/run_erl
-%attr(755,root,root) %{_libdir}/erlang/erts-*/bin/start
-%attr(755,root,root) %{_libdir}/erlang/erts-*/bin/to_erl
-%{_libdir}/erlang/erts-*/bin/start*.*
-%{_libdir}/erlang/lib
-%dir %{_libdir}/erlang/misc
-%attr(755,root,root) %{_libdir}/erlang/misc/*
-%{_libdir}/erlang/releases
-%{_libdir}/erlang/usr
-%attr(755,root,root) %{_libdir}/erlang/Install
+%dir %{_libdir}/%{name}/bin
+%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/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
+%{_libdir}/%{name}/bin/start*.*
+%dir %{_libdir}/%{name}/erts-*
+%{_libdir}/%{name}/erts-*/doc
+%{_libdir}/%{name}/erts-*/man
+%{_libdir}/%{name}/erts-*/src
+%{_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*
+%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
+%{_libdir}/%{name}/erts-*/bin/start*.*
+# (file list dynamically generated) %{_libdir}/%{name}/lib
+%dir %{_libdir}/%{name}/misc
+%attr(755,root,root) %{_libdir}/%{name}/misc/*
+%{_libdir}/%{name}/releases
+%{_libdir}/%{name}/usr
+%doc %{_libdir}/%{name}/man
+%attr(755,root,root) %{_libdir}/%{name}/Install