commit d7527671ccb91dee753e0ae51dd78322d1a158da
Author: Jan Palus <[email protected]>
Date: Sat Nov 9 01:22:34 2024 +0100
up to 27.1.2
erlang-no-fop.patch | 13 -------------
erlang.spec | 14 +++++---------
2 files changed, 5 insertions(+), 22 deletions(-)
---
diff --git a/erlang.spec b/erlang.spec
index 4a3e8a5..5f9e29f 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -13,33 +13,32 @@
%bcond_without doc # build documentation
#
-%define erts_version 13.1.2
+%define erts_version 15.1.2
Summary: OpenSource Erlang/OTP
Summary(pl.UTF-8): Erlang/OTP z otwartymi źródłami
Name: erlang
-Version: 25.1.2
+Version: 27.1.2
Release: 1
Epoch: 2
%define _version %(echo %{version} | tr _ -)
License: APLv2
Group: Development/Languages
Source0: https://github.com/erlang/otp/archive/OTP-%{version}.tar.gz
-# Source0-md5: ac654a239f8e9c3514b183c657bca4bf
+# Source0-md5: e513e7f4633433081eab820e8414c4e1
Source2: epmd.service
Source3: epmd.socket
Source4: [email protected]
Source5: [email protected]
Patch0: %{name}-fPIC.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: autoconf >= 2.69
BuildRequires: automake
+%{?with_doc:BuildRequires: ex_doc}
BuildRequires: flex
%{?with_java:BuildRequires: jdk >= 1.2}
BuildRequires: libstdc++-devel
@@ -88,7 +87,6 @@ Dokumentacja do Erlanga.
%setup -q -n otp-OTP-%{_version}
#%patch0 -p1
%patch1 -p1
-%patch2 -p1
%patch4 -p1
@@ -113,7 +111,7 @@ ERL_TOP=`pwd`; export ERL_TOP
TARGET="%{_erl_target}" \
|| { find . -name erl_crash.dump | xargs cat ; exit 1 ; }
-%{?with_doc:%{__make} -j1 docs}
+%{?with_doc:LC_ALL=C.UTF-8 %{__make} -j1 docs}
%install
rm -rf $RPM_BUILD_ROOT
@@ -139,7 +137,6 @@ install -D -p %{SOURCE5}
$RPM_BUILD_ROOT%{systemdunitdir}/[email protected]
%{__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
@@ -208,7 +205,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/%{name}/bin/typer
%{_libdir}/%{name}/bin/start*.*
%dir %{_libdir}/%{name}/erts-%{erts_version}
-%{?with_doc:%{_libdir}/%{name}/erts-%{erts_version}/info}
%{_libdir}/%{name}/erts-%{erts_version}/man
%{_libdir}/%{name}/erts-%{erts_version}/src
%{_libdir}/%{name}/erts-%{erts_version}/include
diff --git a/erlang-no-fop.patch b/erlang-no-fop.patch
deleted file mode 100644
index c6f0adb..0000000
--- a/erlang-no-fop.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- otp-OTP-21.3.8.6/erts/configure.ac.orig 2019-07-11 17:18:55.000000000
+0200
-+++ otp-OTP-21.3.8.6/erts/configure.ac 2019-09-09 17:44:05.368217526 +0200
-@@ -459,7 +459,8 @@ if test -z "$XSLTPROC"; then
- AC_MSG_WARN([No 'xsltproc' command found: the documentation cannot be
built])
- fi
-
--AC_CHECK_PROGS(FOP, fop)
-+dnl AC_CHECK_PROGS(FOP, fop)
-+AC_SUBST(FOP)
- if test -z "$FOP"; then
- FOP="$ERL_TOP/make/fakefop"
- echo "fop" >> doc/CONF_INFO
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/erlang.git/commitdiff/d7527671ccb91dee753e0ae51dd78322d1a158da
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
