X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=erlang.spec;h=4911fc996ebb65f4e40f1e43dc69860309f1e674;hb=refs%2Fheads%2Fmaster;hp=2df87b457f85473441f59faf40e397fc3a705ba6;hpb=1d3d9f59e4b81cbf3a259d8b1270f38760a9c0fb;p=packages%2Ferlang.git

diff --git a/erlang.spec b/erlang.spec
index 2df87b4..6a14f8e 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -11,27 +11,33 @@
 %bcond_with	java		# with Java support
 %bcond_without	odbc		# without unixODBC support
 #
+
+%define		erts_version	13.1.2
+
 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:	R15B
+Version:	25.1.2
 Release:	1
-Epoch:		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:	dd6c2a4807551b4a8a536067bde31d73
-Source1:	http://www.erlang.org/download/otp_doc_man_%{_version}.tar.gz
-# Source1-md5:	9738da523737712a9db87db0dee05338
+Source0:	https://github.com/erlang/otp/archive/OTP-%{version}.tar.gz
+# Source0-md5:	ac654a239f8e9c3514b183c657bca4bf
+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
+# disable pdf docs (require libxslt-progs and fop > 1.0, with -cache option)
+Patch2:		%{name}-no-fop.patch
+
+Patch4:		%{name}-ac.patch
 URL:		http://www.erlang.org/
 %{?with_java:BuildRequires:	/usr/bin/jar}
-BuildRequires:	xorg-lib-libX11-devel
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake
 BuildRequires:	flex
 %{?with_java:BuildRequires:	jdk >= 1.2}
@@ -39,14 +45,19 @@ BuildRequires:	ncurses-devel
 BuildRequires:	openssl-devel >= 0.9.7
 BuildRequires:	openssl-tools
 BuildRequires:	perl-base
+BuildRequires:	rpm-build >= 4.6
+BuildRequires:	rpmbuild(macros) >= 1.752
+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
@@ -58,32 +69,50 @@ Erlang to język programowania opracowany w Ericsson Computer Science
 Laboratory. Open-source Erlang został wydany, aby pomóc w
 rozpowszechnianiu Erlanga poza Ericssonem.
 
+%package doc
+Summary:	Erlang documentation
+Summary(pl.UTF-8):	Dokumentacja do Erlanga
+Group:		Documentation
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+BuildArch:	noarch
+
+%description doc
+Erlang documentation.
+
+%description doc -l pl.UTF-8
+Dokumentacja do Erlanga.
+
 %prep
-%setup -q -n otp_src_%{_version}
-%{__tar} xzf %{SOURCE1} man/ COPYRIGHT
+%setup -q -n otp-OTP-%{_version}
 #%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 
+%patch4 -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 update_configure --no-commit
+
 %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} \
+	--with-ssl-lib-subdir=%{_lib}
+
 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,77 +120,111 @@ 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
+
+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##" \
+%{__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/edoc-*/bin/edoc \
+	$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
+# Move noarch docs to _datadir
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/erts-%{erts_version}
+%{__mv} $RPM_BUILD_ROOT{%{_libdir},%{_datadir}}/%{name}/doc
+%{__ln} -s %{_datadir}/%{name}/doc $RPM_BUILD_ROOT%{_libdir}/%{name}/doc
+%{__mv} $RPM_BUILD_ROOT{%{_libdir},%{_datadir}}/%{name}/erts-%{erts_version}/doc
+%{__ln} -s %{_datadir}/%{name}/erts-%{erts_version}/doc $RPM_BUILD_ROOT%{_libdir}/%{name}/erts-%{erts_version}/doc
 
 %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
 %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/erl_call
 %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
 %attr(755,root,root) %{_libdir}/%{name}/bin/typer
 %{_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/ct_run
-%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*.*
+%dir %{_libdir}/%{name}/erts-%{erts_version}
+%{_libdir}/%{name}/erts-%{erts_version}/info
+%{_libdir}/%{name}/erts-%{erts_version}/man
+%{_libdir}/%{name}/erts-%{erts_version}/src
+%{_libdir}/%{name}/erts-%{erts_version}/include
+%dir %{_libdir}/%{name}/erts-%{erts_version}/lib
+%dir %{_libdir}/%{name}/erts-%{erts_version}/lib/internal
+%{_libdir}/%{name}/erts-%{erts_version}/lib/internal/liberts_internal*.a
+%{_libdir}/%{name}/erts-%{erts_version}/lib/internal/libethread.a
+#%{_libdir}/%{name}/erts-%{erts_version}/*.ear
+%dir %{_libdir}/%{name}/erts-%{erts_version}/bin
+%attr(755,root,root) %{_libdir}/%{name}/erts-%{erts_version}/bin/beam*
+%attr(755,root,root) %{_libdir}/%{name}/erts-%{erts_version}/bin/ct_run
+%attr(755,root,root) %{_libdir}/%{name}/erts-%{erts_version}/bin/dialyzer
+%attr(755,root,root) %{_libdir}/%{name}/erts-%{erts_version}/bin/dyn_erl
+%attr(755,root,root) %{_libdir}/%{name}/erts-%{erts_version}/bin/e*
+%attr(755,root,root) %{_libdir}/%{name}/erts-%{erts_version}/bin/heart*
+%attr(755,root,root) %{_libdir}/%{name}/erts-%{erts_version}/bin/inet_gethost
+%attr(755,root,root) %{_libdir}/%{name}/erts-%{erts_version}/bin/run_erl
+%attr(755,root,root) %{_libdir}/%{name}/erts-%{erts_version}/bin/start
+%attr(755,root,root) %{_libdir}/%{name}/erts-%{erts_version}/bin/to_erl
+%attr(755,root,root) %{_libdir}/%{name}/erts-%{erts_version}/bin/typer
+%attr(755,root,root) %{_libdir}/%{name}/erts-%{erts_version}/bin/yielding_c_fun
+%{_libdir}/%{name}/erts-%{erts_version}/bin/start*.*
 # (file list dynamically generated) %{_libdir}/%{name}/lib
 %dir %{_libdir}/%{name}/misc
 %attr(755,root,root) %{_libdir}/%{name}/misc/*
@@ -169,3 +232,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/usr
 %doc %{_libdir}/%{name}/man
 %attr(755,root,root) %{_libdir}/%{name}/Install
+
+%{_libdir}/%{name}/doc
+%{_libdir}/%{name}/erts-%{erts_version}/doc
+
+%{systemdunitdir}/epmd.service
+%{systemdunitdir}/epmd.socket
+%{systemdunitdir}/epmd@.service
+%{systemdunitdir}/epmd@.socket
+
+%files doc
+%defattr(644,root,root,755)
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/erts-%{erts_version}
+%{_datadir}/%{name}/doc
+%{_datadir}/%{name}/erts-%{erts_version}/doc