X-Git-Url: http://git.pld-linux.org/?p=packages%2Ferlang.git;a=blobdiff_plain;f=erlang.spec;h=e615dfaa420c8802ade4b5747e0dcf46c77cf37d;hp=277673c132f6110c4f56822559e1816f4a9f64f4;hb=862a8417f3297131a6cf7a17296398104d7b525f;hpb=c6cdd4569ff5a87497cff44cdeb9311dabd03c2c

diff --git a/erlang.spec b/erlang.spec
index 277673c..e615dfa 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -14,23 +14,22 @@
 Summary:	OpenSource Erlang/OTP
 Summary(pl.UTF-8):	Erlang/OTP z otwartymi źródłami
 Name:		erlang
-# A - unstable, B - stable line, keep stable
-Version:	R14B03
-Release:	2
-Epoch:		1
+Version:	21.3.8.6
+Release:	1
+Epoch:		2
 %define		_version	%(echo %{version} | tr _ -)
-License:	distributable
+License:	APLv2
 Group:		Development/Languages
-Source0:	http://www.erlang.org/download/otp_src_%{_version}.tar.gz
-# Source0-md5:	7979e662d11476b97c462feb7c132fb7
-Source1:	http://www.erlang.org/download/otp_doc_man_%{_version}.tar.gz
-# Source1-md5:	357f54b174bb29d41fee97c063a47e8f
+Source0:	https://github.com/erlang/otp/archive/OTP-%{version}.tar.gz
+# Source0-md5:	a5fbab93f78c4db98ecc11ce75f67ac4
+Source2:	epmd.service
+Source3:	epmd.socket
+Source4:	epmd@.service
+Source5:	epmd@.socket
 Patch0:		%{name}-fPIC.patch
-Patch1:		%{name}-tinfo.patch
-Patch2:		%{name}-link.patch
+Patch1:		x32.patch
 URL:		http://www.erlang.org/
 %{?with_java:BuildRequires:	/usr/bin/jar}
-BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	flex
@@ -39,14 +38,17 @@ BuildRequires:	ncurses-devel
 BuildRequires:	openssl-devel >= 0.9.7
 BuildRequires:	openssl-tools
 BuildRequires:	perl-base
+BuildRequires:	xorg-lib-libX11-devel
 %if %{with odbc}
 BuildRequires:	unixODBC-devel
 %else
 BuildConflicts:	unixODBC-devel
 %endif
+Requires:	systemd-units >= 38
+Requires(post,preun,postun):	systemd-units >= 38
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define _erl_target %(echo %{_build}-gnu | 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/;s/x32/x86_64/')
 
 %description
 Erlang is a programming language designed at the Ericsson Computer
@@ -59,31 +61,31 @@ Laboratory. Open-source Erlang został wydany, aby pomóc w
 rozpowszechnianiu Erlanga poza Ericssonem.
 
 %prep
-%setup -q -n otp_src_%{_version}
-%{__tar} xzf %{SOURCE1} man/ COPYRIGHT
+%setup -q -n otp-OTP-%{_version}
 #%patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
-find . -name config.sub | xargs -n 1 cp -f /usr/share/automake/config.sub
-curd=$(pwd)
-for i in $(find . -type f -name configure.in); do
-	cd $(dirname $i)
-	%{__autoconf}
-	cd $curd
-done
+./otp_build autoconf
+
 %configure \
 %ifarch sparc
 	CFLAGS="%{rpmcflags} -mv8plus" \
 %endif
-	--with%{!?with_java:out}-javac
+%ifarch x32
+	--disable-hipe \
+%endif
+	--disable-silent-rules \
+	--enable-smp-support \
+	--with-javac%{!?with_java:=no}
 rm -f lib/ssl/SKIP
 ERL_TOP=`pwd`; export ERL_TOP
  %{__make} -j1 \
 	TARGET="%{_erl_target}" \
 	|| { find . -name erl_crash.dump | xargs cat ; exit 1 ; }
 
+%{__make} -j1 docs
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -91,42 +93,66 @@ rm -rf $RPM_BUILD_ROOT
 	TARGET="%{_erl_target}" \
 	INSTALL_PREFIX=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/erts-*/*.html
+env ERL_LIBS="$RPM_BUILD_ROOT%{_libdir}/erlang/lib" \
+	%{__make} install-docs \
+		DESTDIR=$RPM_BUILD_ROOT
 
-sed -i -e"s#$RPM_BUILD_ROOT##" \
+install -D -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdunitdir}/epmd.service
+install -D -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/epmd.socket
+install -D -p %{SOURCE4} $RPM_BUILD_ROOT%{systemdunitdir}/epmd@.service
+install -D -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir}/epmd@.socket
+
+%{__sed} -i -e"s#$RPM_BUILD_ROOT##" \
 	$RPM_BUILD_ROOT%{_libdir}/%{name}/bin/{erl,start,start_erl}
 
-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 epmd ; do
-	ln -sf $ERTSDIR/bin/$l $RPM_BUILD_ROOT%{_bindir}
-done
-ln -sf $ERTSDIR/bin/epmd $RPM_BUILD_ROOT%{_libdir}/%{name}/bin
+%{__sed} -i -e '1s,/usr/bin/env escript,/usr/bin/escript,' \
+	$RPM_BUILD_ROOT%{_libdir}/%{name}/lib/diameter-*/bin/diameterc \
+	$RPM_BUILD_ROOT%{_libdir}/%{name}/lib/erl_docgen-*/priv/bin/{codeline_preprocessing,xml_from_edoc}.escript \
+	$RPM_BUILD_ROOT%{_libdir}/%{name}/lib/reltool-*/examples/{display_args,mnesia_core_dump_viewer} \
+	$RPM_BUILD_ROOT%{_libdir}/%{name}/lib/snmp-*/bin/snmpc \
+	$RPM_BUILD_ROOT%{_libdir}/%{name}/lib/snmp-*/src/compiler/snmpc.src
 
-cp -r man $RPM_BUILD_ROOT%{_libdir}/%{name}
-find $RPM_BUILD_ROOT%{_libdir}/%{name}/man -type f | xargs gzip -9
+#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
+	| %{__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
+	| %{__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
+	| %{__sed} -e"s#^$RPM_BUILD_ROOT%{_libdir}/%{name}/#%%{_libdir}/%%{name}/#" >> lib.list
 
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/erts-*/lib
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/erts-*/include/internal
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/erts-*/lib
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/erts-*/include/internal
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%systemd_post epmd.service
+%systemd_post epmd@.service
+
+%preun
+%systemd_preun epmd.service
+%systemd_preun epmd@.service
+
+%postun
+%systemd_reload
+
 %files -f lib.list
 %defattr(644,root,root,755)
-%doc AUTHORS EPLICENCE COPYRIGHT
-%attr(755,root,root) %{_bindir}/*
+%doc AUTHORS
+%attr(755,root,root) %{_bindir}/ct_run
+%attr(755,root,root) %{_bindir}/dialyzer
+%attr(755,root,root) %{_bindir}/epmd
+%attr(755,root,root) %{_bindir}/erl
+%attr(755,root,root) %{_bindir}/erlc
+%attr(755,root,root) %{_bindir}/escript
+%attr(755,root,root) %{_bindir}/run_erl
+%attr(755,root,root) %{_bindir}/to_erl
+%attr(755,root,root) %{_bindir}/typer
 %dir %{_libdir}/erlang
 %dir %{_libdir}/%{name}/bin
 %attr(755,root,root) %{_libdir}/%{name}/bin/ct_run
@@ -135,8 +161,8 @@ rm -rf $RPM_BUILD_ROOT
 %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/no_dot_erlang.boot
 %attr(755,root,root) %{_libdir}/%{name}/bin/run_erl
-%attr(755,root,root) %{_libdir}/%{name}/bin/run_test
 %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
@@ -150,7 +176,6 @@ rm -rf $RPM_BUILD_ROOT
 #%{_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/ct_run
 %attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/dialyzer
 %attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/dyn_erl
@@ -169,3 +194,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/usr
 %doc %{_libdir}/%{name}/man
 %attr(755,root,root) %{_libdir}/%{name}/Install
+
+%{systemdunitdir}/epmd.service
+%{systemdunitdir}/epmd.socket
+%{systemdunitdir}/epmd@.service
+%{systemdunitdir}/epmd@.socket