diff --git a/erlang.spec b/erlang.spec index 878fb41..90b3901 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,36 +1,28 @@ -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} -%ifarch %{arm} %{mips} riscv64 %{ix86} -# MIPS and RISC-V does not have all dependencies for fop yet. +%ifarch %{arm} %{mips} riscv64 +# MIPS does not have all dependencies for fop yet # For some reason, fop hangs on arm, so for now don't generate docs by # default %bcond_with doc %else -# RHEL8 doesn't have fop -%if 0%{?rhel} > 7 -%bcond_with doc -%else %bcond_without doc %endif -%endif -# Compile with FIPS support by default -%bcond_without fips +%ifarch %{arm} %{ix86} x86_64 ppc %{power64} +%global __with_hipe 1 +%endif ## ## Optional components ## %global __with_emacs 1 +%global __with_xemacs 1 %global __with_examples 1 -%ifarch %{java_arches} %global __with_java 1 -%else -%global __with_java 0 -%endif -%global __with_sources 1 # # wxWidgets plugin blocks the following ones: # @@ -68,13 +60,16 @@ Name: erlang -Version: 26.2.5.16 +Version: 20.3.8.24 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment -License: Apache-2.0 +Group: Development/Languages +License: ASL 2.0 URL: https://www.erlang.org -VCS: git:https://github.com/erlang/otp.git +%if ! (0%{?rhel} && 0%{?rhel} <= 6) +VCS: scm:git:https://github.com/erlang/otp +%endif Source0: https://github.com/erlang/otp/archive/OTP-%{version}/otp-OTP-%{version}.tar.gz Source5: epmd.service Source6: epmd.socket @@ -103,18 +98,19 @@ Patch2: otp-0002-Remove-rpath.patch Patch3: otp-0003-Do-not-install-C-sources.patch Patch4: otp-0004-Do-not-install-Java-sources.patch Patch5: otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch -Patch6: otp-0006-Add-extra-search-directory.patch -Patch7: otp-0007-Avoid-forking-sed-to-get-basename.patch -Patch8: otp-0008-Load-man-pages-from-system-wide-directory.patch -Patch9: otp-0009-Add-GDB-tools.patch +Patch6: otp-0006-Do-not-install-erlang-sources.patch +Patch7: otp-0007-Fix-erl_epmd-port_please-when-using-IPv6.patch +Patch8: otp-0008-Add-extra-search-directory.patch +Patch9: otp-0009-Avoid-forking-sed-to-get-basename.patch +Patch10: otp-0010-Load-man-pages-from-system-wide-directory.patch +Patch11: otp-0011-Improve-nodes-querying.patch +Patch12: otp-0012-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch +Patch13: otp-0013-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch # end of autogenerated patch tag list BuildRequires: gcc BuildRequires: gcc-c++ -# For gdb-tools -BuildRequires: gdb BuildRequires: flex -BuildRequires: make %if %{with doc} %if 0%{?need_bootstrap} < 1 @@ -123,11 +119,13 @@ BuildRequires: erlang %endif %endif +%if ! (0%{?rhel} && 0%{?rhel} <= 6) # for BuildRequires: systemd-devel BuildRequires: systemd %{?systemd_requires} Requires: systemd +%endif BuildRequires: autoconf BuildRequires: automake #BuildRequires: erlang-rpm-macros @@ -135,15 +133,22 @@ BuildRequires: automake Requires: %{name}-asn1%{?_isa} = %{version}-%{release} %if %{__with_wxwidgets} Requires: %{name}-common_test%{?_isa} = %{version}-%{release} -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} Requires: %{name}-compiler%{?_isa} = %{version}-%{release} +Requires: %{name}-cosEvent%{?_isa} = %{version}-%{release} +Requires: %{name}-cosEventDomain%{?_isa} = %{version}-%{release} +Requires: %{name}-cosFileTransfer%{?_isa} = %{version}-%{release} +Requires: %{name}-cosNotification%{?_isa} = %{version}-%{release} +Requires: %{name}-cosProperty%{?_isa} = %{version}-%{release} +Requires: %{name}-cosTime%{?_isa} = %{version}-%{release} +Requires: %{name}-cosTransactions%{?_isa} = %{version}-%{release} Requires: %{name}-crypto%{?_isa} = %{version}-%{release} %if %{__with_wxwidgets} Requires: %{name}-debugger%{?_isa} = %{version}-%{release} -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} %if %{__with_wxwidgets} Requires: %{name}-dialyzer%{?_isa} = %{version}-%{release} -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} Requires: %{name}-diameter%{?_isa} = %{version}-%{release} Requires: %{name}-edoc%{?_isa} = %{version}-%{release} Requires: %{name}-eldap%{?_isa} = %{version}-%{release} @@ -152,41 +157,44 @@ Requires: %{name}-erl_interface%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} %if %{__with_wxwidgets} Requires: %{name}-et%{?_isa} = %{version}-%{release} -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} Requires: %{name}-eunit%{?_isa} = %{version}-%{release} -Requires: %{name}-ftp%{?_isa} = %{version}-%{release} +Requires: %{name}-hipe%{?_isa} = %{version}-%{release} +%if %{__with_java} +Requires: %{name}-ic%{?_isa} = %{version}-%{release} +%endif %{__with_java} Requires: %{name}-inets%{?_isa} = %{version}-%{release} %if %{__with_java} Requires: %{name}-jinterface%{?_isa} = %{version}-%{release} -%endif # __with_java +%endif %{__with_java} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} %if %{__with_wxwidgets} Requires: %{name}-megaco%{?_isa} = %{version}-%{release} -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} %if %{__with_wxwidgets} Requires: %{name}-observer%{?_isa} = %{version}-%{release} -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} Requires: %{name}-odbc%{?_isa} = %{version}-%{release} +Requires: %{name}-orber%{?_isa} = %{version}-%{release} Requires: %{name}-os_mon%{?_isa} = %{version}-%{release} +Requires: %{name}-otp_mibs%{?_isa} = %{version}-%{release} Requires: %{name}-parsetools%{?_isa} = %{version}-%{release} Requires: %{name}-public_key%{?_isa} = %{version}-%{release} %if %{__with_wxwidgets} Requires: %{name}-reltool%{?_isa} = %{version}-%{release} -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-sasl%{?_isa} = %{version}-%{release} Requires: %{name}-snmp%{?_isa} = %{version}-%{release} -Requires: %{name}-src%{?_isa} = %{version}-%{release} Requires: %{name}-ssh%{?_isa} = %{version}-%{release} Requires: %{name}-ssl%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} -Requires: %{name}-tftp%{?_isa} = %{version}-%{release} Requires: %{name}-tools%{?_isa} = %{version}-%{release} %if %{__with_wxwidgets} Requires: %{name}-wx%{?_isa} = %{version}-%{release} -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} %description @@ -199,6 +207,7 @@ systems from Ericsson. %package asn1 Summary: Provides support for Abstract Syntax Notation One +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -209,6 +218,7 @@ Provides support for Abstract Syntax Notation One. %if %{__with_wxwidgets} %package common_test Summary: A portable framework for automatic testing +Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-debugger%{?_isa} = %{version}-%{release} @@ -228,24 +238,109 @@ Obsoletes: erlang-test_server %description common_test A portable framework for automatic testing. -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} %package compiler Summary: A byte code compiler for Erlang which produces highly compact code +Group: Development/Languages Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-hipe%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description compiler A byte code compiler for Erlang which produces highly compact code. +%package cosEvent +Summary: Orber OMG Event Service +Group: Development/Languages +Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-kernel%{?_isa} = %{version}-%{release} +Requires: %{name}-orber%{?_isa} = %{version}-%{release} +Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} + +%description cosEvent +Orber OMG Event Service. + +%package cosEventDomain +Summary: Orber OMG Event Domain Service +Group: Development/Languages +Requires: %{name}-cosNotification%{?_isa} = %{version}-%{release} +Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-kernel%{?_isa} = %{version}-%{release} +Requires: %{name}-orber%{?_isa} = %{version}-%{release} +Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} + +%description cosEventDomain +Orber OMG Event Domain Service. + +%package cosFileTransfer +Summary: Orber OMG File Transfer Service +Group: Development/Languages +Requires: %{name}-cosProperty%{?_isa} = %{version}-%{release} +Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-inets%{?_isa} = %{version}-%{release} +Requires: %{name}-kernel%{?_isa} = %{version}-%{release} +Requires: %{name}-orber%{?_isa} = %{version}-%{release} +Requires: %{name}-ssl%{?_isa} = %{version}-%{release} +Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} + +%description cosFileTransfer +Orber OMG File Transfer Service. + +%package cosNotification +Summary: Orber OMG Notification Service +Group: Development/Languages +Requires: %{name}-cosEvent%{?_isa} = %{version}-%{release} +Requires: %{name}-cosTime%{?_isa} = %{version}-%{release} +Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-kernel%{?_isa} = %{version}-%{release} +Requires: %{name}-orber%{?_isa} = %{version}-%{release} +Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} + +%description cosNotification +Orber OMG Notification Service. + +%package cosProperty +Summary: Orber OMG Property Service +Group: Development/Languages +Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-kernel%{?_isa} = %{version}-%{release} +Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} +Requires: %{name}-orber%{?_isa} = %{version}-%{release} +Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} + +%description cosProperty +Orber OMG Property Service. + +%package cosTime +Summary: Orber OMG Timer and TimerEvent Service +Group: Development/Languages +Requires: %{name}-cosEvent%{?_isa} = %{version}-%{release} +Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-kernel%{?_isa} = %{version}-%{release} +Requires: %{name}-orber%{?_isa} = %{version}-%{release} +Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} + +%description cosTime +Orber OMG Timer and TimerEvent Service. + +%package cosTransactions +Summary: Orber OMG Transaction Service +Group: Development/Languages +Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-kernel%{?_isa} = %{version}-%{release} +Requires: %{name}-orber%{?_isa} = %{version}-%{release} +Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} + +%description cosTransactions +Orber OMG Transaction Service. + %package crypto Summary: Cryptographical support +Group: Development/Languages BuildRequires: pkgconfig(openssl) -%if 0%{?fedora} > 40 -BuildRequires: openssl-devel-engine -%endif Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -256,6 +351,7 @@ Cryptographical support. %if %{__with_wxwidgets} %package debugger Summary: A debugger for debugging and testing of Erlang programs +Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -264,13 +360,15 @@ Requires: %{name}-wx%{?_isa} = %{version}-%{release} %description debugger A debugger for debugging and testing of Erlang programs. -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} %if %{__with_wxwidgets} %package dialyzer Summary: A DIscrepancy AnaLYZer for ERlang programs +Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-hipe%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} @@ -280,10 +378,11 @@ Obsoletes: erlang-typer %description dialyzer A DIscrepancy AnaLYZer for ERlang programs. -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} %package diameter Summary: Diameter (RFC 3588) library +Group: Development/Languages BuildRequires: ed Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -298,8 +397,10 @@ Diameter (RFC 3588) library %if %{with doc} %package doc Summary: Erlang documentation +Group: Development/Languages BuildRequires: fop BuildRequires: libxslt +BuildArch: noarch %description doc Documentation for Erlang. @@ -307,6 +408,7 @@ Documentation for Erlang. %package edoc Summary: A utility used to generate documentation out of tags in source files +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -319,6 +421,7 @@ A utility used to generate documentation out of tags in source files. %package eldap Summary: Erlang LDAP library +Group: Development/Languages Requires: %{name}-asn1%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -330,6 +433,7 @@ Erlang LDAP library. %package erl_docgen Summary: A utility used to generate erlang HTML documentation +Group: Development/Languages Requires: %{name}-edoc%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -340,6 +444,7 @@ A utility used to generate erlang HTML documentation. %package erl_interface Summary: Low level interface to C +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} %description erl_interface @@ -347,11 +452,13 @@ Low level interface to C. %package erts Summary: Functionality necessary to run the Erlang System itself +Group: Development/Languages BuildRequires: lksctp-tools-devel BuildRequires: m4 BuildRequires: ncurses-devel BuildRequires: zlib-devel # epmd user, epmd group +Requires(pre): shadow-utils Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: lksctp-tools @@ -360,19 +467,14 @@ Requires: lksctp-tools Provides: erlang(erl_drv_version) = 3.3 # See erts/emulator/beam/erl_nif.h or call erlang:system_info(nif_version). #Provides: erlang(erl_nif_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(nif_version)).' -s erlang halt) -Provides: erlang(erl_nif_version) = 2.17 -Provides: bundled(pcre) = 8.44 -# git commit 965d19506ff2aed72e039b8c650b6ef5e9446b8c -Provides: bundled(asmjit) +Provides: erlang(erl_nif_version) = 2.13 +Provides: bundled(pcre) = 8.33 Obsoletes: erlang-appmon Obsoletes: erlang-docbuilder Obsoletes: erlang-gs -Obsoletes: erlang-hipe Obsoletes: erlang-inviso Obsoletes: erlang-ose -Obsoletes: erlang-otp_mibs -# Moved to https://github.com/erlang/percept -Obsoletes: erlang-percept < 20.2.3 +Obsoletes: erlang-percept Obsoletes: erlang-pman Obsoletes: erlang-toolbar Obsoletes: erlang-tv @@ -384,6 +486,7 @@ Functionality necessary to run the Erlang System itself. %if %{__with_wxwidgets} %package et Summary: An event tracer for Erlang programs +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} @@ -392,10 +495,11 @@ Requires: %{name}-wx%{?_isa} = %{version}-%{release} %description et An event tracer for Erlang programs. -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} %package eunit Summary: Support for unit testing +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -406,6 +510,7 @@ Support for unit testing. %if %{__with_examples} %package examples Summary: Examples for some Erlang modules +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-public_key%{?_isa} = %{version}-%{release} @@ -415,27 +520,37 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description examples Examples for some Erlang modules. -%endif # __with_examples +%endif %{__with_examples} -%package ftp -Summary: FTP client +%package hipe +Summary: High Performance Erlang +Group: Development/Languages +Requires: %{name}-compiler%{?_isa} = %{version}-%{release} +Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-kernel%{?_isa} = %{version}-%{release} +Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} +Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} + +%description hipe +High Performance Erlang. + +%package ic +Summary: IDL compiler +Group: Development/Languages +%if %{__with_java} +BuildRequires: java-devel +Requires: javapackages-tools +%endif %{__with_java} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -%description ftp -FTP client. - -%package gdb-tools -Summary: GDB plugin -License: GPL-3.0-or-later -Requires: gdb - -%description gdb-tools -GDB plugin. +%description ic +IDL compiler. %package inets -Summary: A set of services such as a Web server and a HTTP client etc +Summary: A set of services such as a Web server and a ftp client etc +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} @@ -444,21 +559,23 @@ Requires: %{name}-ssl%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description inets -A set of services such as a Web server and a HTTP client etc. +A set of services such as a Web server and a ftp client etc. %if %{__with_java} %package jinterface Summary: A library for accessing Java from Erlang +Group: Development/Languages BuildRequires: java-devel Requires: javapackages-tools Requires: %{name}-erts%{?_isa} = %{version}-%{release} %description jinterface Low level interface to Java. -%endif # __with_java +%endif %{__with_java} %package kernel Summary: Main erlang library +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -468,6 +585,7 @@ Main erlang library. %if %{__with_wxwidgets} %package megaco Summary: Megaco/H.248 support library +Group: Development/Languages Requires: %{name}-asn1%{?_isa} = %{version}-%{release} Requires: %{name}-debugger%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -480,10 +598,11 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Megaco/H.248 is a protocol for control of elements in a physically decomposed multimedia gateway, enabling separation of call control from media conversion. -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} %package mnesia Summary: A heavy duty real-time distributed database +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -494,6 +613,7 @@ A heavy duty real-time distributed database. %if %{__with_wxwidgets} %package observer Summary: A set of tools for tracing and investigation of distributed systems +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-et%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} @@ -504,10 +624,11 @@ Requires: %{name}-wx%{?_isa} = %{version}-%{release} %description observer A set of tools for tracing and investigation of distributed systems. -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} %package odbc Summary: A library for unixODBC support in Erlang +Group: Development/Languages BuildRequires: unixODBC-devel Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -517,11 +638,26 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} An interface to relational SQL-databases built on ODBC (Open Database Connectivity). +%package orber +Summary: A CORBA Object Request Broker +Group: Development/Languages +Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-inets%{?_isa} = %{version}-%{release} +Requires: %{name}-kernel%{?_isa} = %{version}-%{release} +Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} +Requires: %{name}-ssl%{?_isa} = %{version}-%{release} +Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} + +%description orber +A CORBA Object Request Broker. + %package os_mon Summary: A monitor which allows inspection of the underlying operating system +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} +Requires: %{name}-otp_mibs%{?_isa} = %{version}-%{release} Requires: %{name}-sasl%{?_isa} = %{version}-%{release} Requires: %{name}-snmp%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -529,8 +665,21 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description os_mon A monitor which allows inspection of the underlying operating system. +%package otp_mibs +Summary: SNMP management information base for Erlang/OTP nodes +Group: Development/Languages +Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-kernel%{?_isa} = %{version}-%{release} +Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} +Requires: %{name}-snmp%{?_isa} = %{version}-%{release} +Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} + +%description otp_mibs +SNMP management information base for Erlang/OTP nodes. + %package parsetools Summary: A set of parsing and lexical analysis tools +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -540,6 +689,7 @@ A set of parsing and lexical analysis tools. %package public_key Summary: API to public key infrastructure +Group: Development/Languages Requires: %{name}-asn1%{?_isa} = %{version}-%{release} Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -552,6 +702,7 @@ API to public key infrastructure. %if %{__with_wxwidgets} %package reltool Summary: A release management tool +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-sasl%{?_isa} = %{version}-%{release} @@ -566,10 +717,11 @@ between applications. The graphical frontend depicts the dependencies and enables interactive customization of a target system. The backend provides a batch interface for generation of customized target systems. -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} %package runtime_tools Summary: A set of tools to include in a production system +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} @@ -580,6 +732,7 @@ A set of tools to include in a production system. %package sasl Summary: The System Architecture Support Libraries +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -591,6 +744,7 @@ release upgrades and alarm handling etc. %package snmp Summary: Simple Network Management Protocol (SNMP) support +Group: Development/Languages Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -602,52 +756,9 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Simple Network Management Protocol (SNMP) support including a MIB compiler and tools for creating SNMP agents. -%if %{__with_sources} -%package src -Summary: Erlang sources -Requires: %{name}-asn1%{?_isa} = %{version}-%{release} -Requires: %{name}-common_test%{?_isa} = %{version}-%{release} -Requires: %{name}-compiler%{?_isa} = %{version}-%{release} -Requires: %{name}-crypto%{?_isa} = %{version}-%{release} -Requires: %{name}-debugger%{?_isa} = %{version}-%{release} -Requires: %{name}-dialyzer%{?_isa} = %{version}-%{release} -Requires: %{name}-diameter%{?_isa} = %{version}-%{release} -Requires: %{name}-edoc%{?_isa} = %{version}-%{release} -Requires: %{name}-eldap%{?_isa} = %{version}-%{release} -Requires: %{name}-erl_docgen%{?_isa} = %{version}-%{release} -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-et%{?_isa} = %{version}-%{release} -Requires: %{name}-eunit%{?_isa} = %{version}-%{release} -Requires: %{name}-ftp%{?_isa} = %{version}-%{release} -Requires: %{name}-inets%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-megaco%{?_isa} = %{version}-%{release} -Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} -Requires: %{name}-observer%{?_isa} = %{version}-%{release} -Requires: %{name}-odbc%{?_isa} = %{version}-%{release} -Requires: %{name}-os_mon%{?_isa} = %{version}-%{release} -Requires: %{name}-parsetools%{?_isa} = %{version}-%{release} -Requires: %{name}-public_key%{?_isa} = %{version}-%{release} -Requires: %{name}-reltool%{?_isa} = %{version}-%{release} -Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} -Requires: %{name}-sasl%{?_isa} = %{version}-%{release} -Requires: %{name}-snmp%{?_isa} = %{version}-%{release} -Requires: %{name}-ssh%{?_isa} = %{version}-%{release} -Requires: %{name}-ssl%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} -Requires: %{name}-tftp%{?_isa} = %{version}-%{release} -Requires: %{name}-tools%{?_isa} = %{version}-%{release} -Requires: %{name}-wx%{?_isa} = %{version}-%{release} -Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} - -%description src -Erlang sources. It may be useful as a reference for code completion tools in -various editors, for documentation or automatical-code generation purposes. -%endif # __with_sources - %package ssh Summary: Secure Shell application with sftp and ssh support +Group: Development/Languages Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -659,6 +770,7 @@ Secure Shell application with sftp and ssh support. %package ssl Summary: Secure Socket Layer support +Group: Development/Languages Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} @@ -671,6 +783,7 @@ Secure Socket Layer support. %package stdlib Summary: The Erlang standard libraries +Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -681,6 +794,7 @@ The Erlang standard libraries. %package syntax_tools Summary: A set of tools for dealing with erlang sources +Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -690,21 +804,17 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} A utility used to handle abstract Erlang syntax trees, reading source files differently, pretty-printing syntax trees. -%package tftp -Summary: TFTP client -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description tftp -TFTP client. - %package tools Summary: A set of programming tools including a coverage analyzer etc +Group: Development/Languages %if %{__with_emacs} BuildRequires: emacs BuildRequires: emacs-el -%endif # __with_emacs +%endif %{__with_emacs} +%if %{__with_xemacs} +BuildRequires: xemacs +BuildRequires: xemacs-packages-extra-el +%endif %{__with_xemacs} Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} @@ -715,7 +825,12 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: emacs-filesystem Obsoletes: emacs-erlang Obsoletes: emacs-erlang-el -%endif # __with_emacs +%endif %{__with_emacs} +%if %{__with_xemacs} +Requires: xemacs-filesystem +Obsoletes: xemacs-erlang +Obsoletes: xemacs-erlang-el +%endif %{__with_xemacs} %description tools @@ -724,7 +839,8 @@ A set of programming tools including a coverage analyzer etc. %if %{__with_wxwidgets} %package wx Summary: A library for wxWidgets support in Erlang -BuildRequires: wxGTK-devel +Group: Development/Languages +BuildRequires: wxGTK3-devel Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -733,10 +849,11 @@ Requires: mesa-libGLU %description wx A Graphics System used to write platform independent user interfaces. -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} %package xmerl Summary: Provides support for XML 1.0 +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -753,15 +870,11 @@ Provides support for XML 1.0. # remove shipped zlib sources #rm -f erts/emulator/zlib/*.[ch] -# Create a sysusers.d config file -cat >erlang.sysusers.conf < xemacs-erlang-init.el << EOF +(setq load-path (cons "%{_xemacs_sitelispdir}/erlang" load-path)) +(setq erlang-root-dir "%{_libdir}/erlang") +(setq exec-path (cons "%{_libdir}/erlang/bin" exec-path)) +(require 'erlang-start) +EOF +mkdir xemacs-erlang +cp lib/tools/emacs/*.el xemacs-erlang/ +rm -f xemacs-erlang/erlang-flymake.el xemacs-erlang/erlang-test.el xemacs-erlang/erldoc.el xemacs-erlang/erlang-edoc.el +pushd xemacs-erlang +%{_xemacs_bytecompile} *.el +popd +%endif %{__with_xemacs} -%make_build +make %if %{with doc} # should use FOP_OPTS after #832323 is resolved @@ -846,7 +967,20 @@ for f in lib/tools/emacs/{README,*.el}; do "$RPM_BUILD_ROOT%{_emacs_sitelispdir}/erlang/" done install -m 0644 emacs-erlang/*.elc "$RPM_BUILD_ROOT%{_emacs_sitelispdir}/erlang/" -%endif # __with_emacs +%endif %{__with_emacs} +%if %{__with_xemacs} +# XEmacs related stuff +install -m 0755 -d "$RPM_BUILD_ROOT%{_xemacs_sitestartdir}" +install -m 0755 -d "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang" +install -m 0644 xemacs-erlang-init.el "$RPM_BUILD_ROOT%{_xemacs_sitestartdir}/erlang-init.el" +for f in lib/tools/emacs/{README,*.el}; do + b="$(basename "$f")"; + ln -s "%{_libdir}/erlang/lib/tools-${erlang_tools_vsn}/emacs/$b" \ + "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang/" +done +rm -f "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang/erlang-flymake.el" +install -m 0644 xemacs-erlang/*.elc "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang/" +%endif %{__with_xemacs} make DESTDIR=$RPM_BUILD_ROOT install @@ -864,7 +998,7 @@ find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist -type d -pe %else # Remove all examples find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ -mindepth 1 -maxdepth 2 -type d -name examples -exec rm -rf {} \; -%endif # __with_examples +%endif %{__with_examples} chmod 0755 $RPM_BUILD_ROOT%{_libdir}/erlang/bin @@ -876,12 +1010,7 @@ cd $RPM_BUILD_ROOT%{_libdir}/erlang mv -v doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} for i in erts-* ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/$i ; done cd $RPM_BUILD_ROOT%{_libdir}/erlang/lib -for i in * ; do - mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/lib/$i || true - # symlink 'chunks' in the code path for EEP-48 compliance (rhbz#2068758) - mkdir $i/doc - ln -s %{_docdir}/%{name}-%{version}/lib/$i/chunks $i/doc/ -done +for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/lib/$i || true ; done popd cp -av AUTHORS LICENSE.txt README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} @@ -936,34 +1065,28 @@ done # symlink *.jar files to appropriate places for subpackages install -m 0755 -d "$RPM_BUILD_ROOT%{_javadir}/%{name}" +# erlang-ic +ic_lib_dir="$(ls -d1 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ic-*/ | sed "s,^$RPM_BUILD_ROOT,,")" +test -d "$RPM_BUILD_ROOT$ic_lib_dir" +ln -s "${ic_lib_dir}priv/ic.jar" "$RPM_BUILD_ROOT%{_javadir}/%{name}/" + # erlang-jinterface jinterface_lib_dir="$(ls -d1 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/jinterface-*/ | sed "s,^$RPM_BUILD_ROOT,,")" test -d "$RPM_BUILD_ROOT$jinterface_lib_dir" ln -s "${jinterface_lib_dir}priv/OtpErlang.jar" "$RPM_BUILD_ROOT%{_javadir}/%{name}/" -%endif # __with_java +%endif %{__with_java} # systemd-related stuff +%if ! (0%{?rhel} && 0%{?rhel} <= 6) install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/epmd.service install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/epmd.socket install -D -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/epmd@.service install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/epmd@.socket +%endif %if %{__with_wxwidgets} echo "No need to fix additional scripts" -# Fix file conflict w/ python3-typer-cli by renaming our typer to erlang-typer. -# We only rename the symlink in %%{_bindir}, not its direct and indirect -# targets in subdirectories of %%{_libdir}. -# -# File conflicts: /usr/bin/typer between erlang-dialyzer and python3-typer-cli -# https://bugzilla.redhat.com/show_bug.cgi?id=2359567 -mv %{buildroot}%{_bindir}/typer %{buildroot}%{_bindir}/erlang-typer -%if %{with doc} -mv %{buildroot}%{_mandir}/man1/typer.1 \ - %{buildroot}%{_mandir}/man1/erlang-typer.1 -sed -r -i 's/^(\.TH[[:blank:]]+)?(typer)\b/\1erlang-\2/' \ - %{buildroot}%{_mandir}/man1/erlang-typer.1 -%endif %else # FIXME workaround for broken Erlang install procedure echo "Removing scripts which won't work w/o wxWidgets anyway" @@ -973,16 +1096,12 @@ do rm -f $RPM_BUILD_ROOT/%{_libdir}/erlang/bin/${exe} rm -f $RPM_BUILD_ROOT/%{_libdir}/erlang/erts-*/bin/${exe} done -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} # Provide a place for noarch libs to live. install -d -p -m 0755 %{buildroot}%{_datadir}/erlang/ install -d -p -m 0755 %{buildroot}%{_datadir}/erlang/lib -install -m0644 -D erlang.sysusers.conf %{buildroot}%{_sysusersdir}/erlang.conf - -# GDB tools -install -D -p -m 0755 ./bin/*/jit-reader.so %{buildroot}%{_libdir}/gdb/jit-reader.so %check TARGET="$(make target_configured)" @@ -993,6 +1112,11 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests # https://github.com/erlang/otp/wiki/Running-tests +%pre erts +getent group epmd >/dev/null || groupadd -r epmd +getent passwd epmd >/dev/null || \ +useradd -r -g epmd -d /dev/null -s /sbin/nologin \ +-c "Erlang Port Mapper Daemon" epmd 2>/dev/null || : %files @@ -1033,23 +1157,137 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/ct_slave.* %{_mandir}/man3/ct_snmp.* %{_mandir}/man3/ct_ssh.* -%{_mandir}/man3/ct_suite.* %{_mandir}/man3/ct_telnet.* %{_mandir}/man3/ct_testspec.* %{_mandir}/man3/unix_telnet.* %{_mandir}/man6/common_test.* %endif -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} %files compiler %{_libdir}/erlang/lib/compiler-*/ %if %{with doc} -%{_mandir}/man3/cerl.* -%{_mandir}/man3/cerl_clauses.* -%{_mandir}/man3/cerl_trees.* %{_mandir}/man3/compile.* %endif +%files cosEvent +%{_libdir}/erlang/lib/cosEvent-*/ +%if %{with doc} +%{_mandir}/man3/cosEventApp.* +%{_mandir}/man3/CosEventChannelAdmin.* +%{_mandir}/man3/CosEventChannelAdmin_ConsumerAdmin.* +%{_mandir}/man3/CosEventChannelAdmin_EventChannel.* +%{_mandir}/man3/CosEventChannelAdmin_ProxyPullConsumer.* +%{_mandir}/man3/CosEventChannelAdmin_ProxyPullSupplier.* +%{_mandir}/man3/CosEventChannelAdmin_ProxyPushConsumer.* +%{_mandir}/man3/CosEventChannelAdmin_ProxyPushSupplier.* +%{_mandir}/man3/CosEventChannelAdmin_SupplierAdmin.* +%endif + +%files cosEventDomain +%{_libdir}/erlang/lib/cosEventDomain-*/ +%if %{with doc} +%{_mandir}/man3/CosEventDomainAdmin.* +%{_mandir}/man3/CosEventDomainAdmin_EventDomain.* +%{_mandir}/man3/CosEventDomainAdmin_EventDomainFactory.* +%{_mandir}/man3/cosEventDomainApp.* +%endif + +%files cosFileTransfer +%dir %{_libdir}/erlang/lib/cosFileTransfer-*/ +%{_libdir}/erlang/lib/cosFileTransfer-*/ebin +%{_libdir}/erlang/lib/cosFileTransfer-*/include +%{_libdir}/erlang/lib/cosFileTransfer-*/src +%if %{with doc} +%{_mandir}/man3/cosFileTransferApp.* +%{_mandir}/man3/CosFileTransfer_Directory.* +%{_mandir}/man3/CosFileTransfer_File.* +%{_mandir}/man3/CosFileTransfer_FileIterator.* +%{_mandir}/man3/CosFileTransfer_FileTransferSession.* +%{_mandir}/man3/CosFileTransfer_VirtualFileSystem.* +%endif + +%files cosNotification +%dir %{_libdir}/erlang/lib/cosNotification-*/ +%{_libdir}/erlang/lib/cosNotification-*/ebin +%{_libdir}/erlang/lib/cosNotification-*/include +%{_libdir}/erlang/lib/cosNotification-*/src +%if %{with doc} +%{_mandir}/man3/CosNotification.* +%{_mandir}/man3/CosNotification_AdminPropertiesAdmin.* +%{_mandir}/man3/cosNotificationApp.* +%{_mandir}/man3/CosNotification_QoSAdmin.* +%{_mandir}/man3/CosNotifyChannelAdmin_ConsumerAdmin.* +%{_mandir}/man3/CosNotifyChannelAdmin_EventChannel.* +%{_mandir}/man3/CosNotifyChannelAdmin_EventChannelFactory.* +%{_mandir}/man3/CosNotifyChannelAdmin_ProxyConsumer.* +%{_mandir}/man3/CosNotifyChannelAdmin_ProxyPullConsumer.* +%{_mandir}/man3/CosNotifyChannelAdmin_ProxyPullSupplier.* +%{_mandir}/man3/CosNotifyChannelAdmin_ProxyPushConsumer.* +%{_mandir}/man3/CosNotifyChannelAdmin_ProxyPushSupplier.* +%{_mandir}/man3/CosNotifyChannelAdmin_ProxySupplier.* +%{_mandir}/man3/CosNotifyChannelAdmin_SequenceProxyPullConsumer.* +%{_mandir}/man3/CosNotifyChannelAdmin_SequenceProxyPullSupplier.* +%{_mandir}/man3/CosNotifyChannelAdmin_SequenceProxyPushConsumer.* +%{_mandir}/man3/CosNotifyChannelAdmin_SequenceProxyPushSupplier.* +%{_mandir}/man3/CosNotifyChannelAdmin_StructuredProxyPullConsumer.* +%{_mandir}/man3/CosNotifyChannelAdmin_StructuredProxyPullSupplier.* +%{_mandir}/man3/CosNotifyChannelAdmin_StructuredProxyPushConsumer.* +%{_mandir}/man3/CosNotifyChannelAdmin_StructuredProxyPushSupplier.* +%{_mandir}/man3/CosNotifyChannelAdmin_SupplierAdmin.* +%{_mandir}/man3/CosNotifyComm_NotifyPublish.* +%{_mandir}/man3/CosNotifyComm_NotifySubscribe.* +%{_mandir}/man3/CosNotifyFilter_Filter.* +%{_mandir}/man3/CosNotifyFilter_FilterAdmin.* +%{_mandir}/man3/CosNotifyFilter_FilterFactory.* +%{_mandir}/man3/CosNotifyFilter_MappingFilter.* +%endif + +%files cosProperty +%dir %{_libdir}/erlang/lib/cosProperty-*/ +%{_libdir}/erlang/lib/cosProperty-*/ebin +%{_libdir}/erlang/lib/cosProperty-*/include +%{_libdir}/erlang/lib/cosProperty-*/src +%if %{with doc} +%{_mandir}/man3/cosProperty.* +%{_mandir}/man3/CosPropertyService_PropertiesIterator.* +%{_mandir}/man3/CosPropertyService_PropertyNamesIterator.* +%{_mandir}/man3/CosPropertyService_PropertySet.* +%{_mandir}/man3/CosPropertyService_PropertySetDef.* +%{_mandir}/man3/CosPropertyService_PropertySetDefFactory.* +%{_mandir}/man3/CosPropertyService_PropertySetFactory.* +%endif + +%files cosTime +%dir %{_libdir}/erlang/lib/cosTime-*/ +%{_libdir}/erlang/lib/cosTime-*/ebin +%{_libdir}/erlang/lib/cosTime-*/include +%{_libdir}/erlang/lib/cosTime-*/src +%if %{with doc} +%{_mandir}/man3/cosTime.* +%{_mandir}/man3/CosTimerEvent_TimerEventHandler.* +%{_mandir}/man3/CosTimerEvent_TimerEventService.* +%{_mandir}/man3/CosTime_TimeService.* +%{_mandir}/man3/CosTime_TIO.* +%{_mandir}/man3/CosTime_UTO.* +%endif + +%files cosTransactions +%dir %{_libdir}/erlang/lib/cosTransactions-*/ +%{_libdir}/erlang/lib/cosTransactions-*/ebin +%{_libdir}/erlang/lib/cosTransactions-*/include +%{_libdir}/erlang/lib/cosTransactions-*/src +%if %{with doc} +%{_mandir}/man3/cosTransactions.* +%{_mandir}/man3/CosTransactions_Control.* +%{_mandir}/man3/CosTransactions_Coordinator.* +%{_mandir}/man3/CosTransactions_RecoveryCoordinator.* +%{_mandir}/man3/CosTransactions_Resource.* +%{_mandir}/man3/CosTransactions_SubtransactionAwareResource.* +%{_mandir}/man3/CosTransactions_Terminator.* +%{_mandir}/man3/CosTransactions_TransactionFactory.* +%endif + %files crypto %{_libdir}/erlang/lib/crypto-*/ %if %{with doc} @@ -1065,23 +1303,23 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/i.* %{_mandir}/man3/int.* %endif -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} %if %{__with_wxwidgets} %files dialyzer %{_bindir}/dialyzer # FIXME FIXME FIXME this must be installed properly!!!!!! -%{_bindir}/erlang-typer +#%%{_bindir}/typer %{_libdir}/erlang/bin/dialyzer %{_libdir}/erlang/bin/typer %{_libdir}/erlang/erts-*/bin/dialyzer %{_libdir}/erlang/erts-*/bin/typer %{_libdir}/erlang/lib/dialyzer-*/ %if %{with doc} -%{_mandir}/man1/erlang-typer.* %{_mandir}/man3/dialyzer.* +%{_mandir}/man3/typer.* %endif -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} %files diameter %dir %{_libdir}/erlang/lib/diameter-*/ @@ -1103,7 +1341,6 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %if %{with doc} %files doc -%{_libdir}/erlang/lib/*/doc %doc %{_docdir}/%{name}-%{version}/doc %doc %{_docdir}/%{name}-%{version}/erts-*/ %doc %{_docdir}/%{name}-%{version}/lib/ @@ -1112,13 +1349,10 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %files edoc %{_libdir}/erlang/lib/edoc-*/ %if %{with doc} -%{_mandir}/man1/edoc.* %{_mandir}/man3/edoc.* %{_mandir}/man3/edoc_doclet.* -%{_mandir}/man3/edoc_doclet_chunks.* %{_mandir}/man3/edoc_extract.* %{_mandir}/man3/edoc_layout.* -%{_mandir}/man3/edoc_layout_chunks.* %{_mandir}/man3/edoc_lib.* %{_mandir}/man3/edoc_run.* %endif @@ -1136,21 +1370,19 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %endif %files erl_interface -%{_libdir}/erlang/bin/erl_call -%{_libdir}/erlang/erts-*/bin/erl_call %{_libdir}/erlang/lib/erl_interface-*/ %if %{with doc} %{_mandir}/man1/erl_call.* %{_mandir}/man3/ei.* %{_mandir}/man3/ei_connect.* -%{_mandir}/man3/ei_global.* -#%%{_mandir}/man3/erl_connect.* -#%%{_mandir}/man3/erl_error.* -#%%{_mandir}/man3/erl_eterm.* -#%%{_mandir}/man3/erl_format.* -#%%{_mandir}/man3/erl_global.* -#%%{_mandir}/man3/erl_malloc.* -#%%{_mandir}/man3/erl_marshal.* +%{_mandir}/man3/erl_connect.* +%{_mandir}/man3/erl_error.* +%{_mandir}/man3/erl_eterm.* +%{_mandir}/man3/erl_format.* +%{_mandir}/man3/erl_global.* +%{_mandir}/man3/erl_malloc.* +%{_mandir}/man3/erl_marshal.* +%{_mandir}/man3/registry.* %endif %files erts @@ -1201,7 +1433,6 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_libdir}/erlang/erts-*/bin/start.src %{_libdir}/erlang/erts-*/bin/start_erl.src %{_libdir}/erlang/erts-*/bin/to_erl -%{_libdir}/erlang/erts-*/bin/yielding_c_fun %{_libdir}/erlang/erts-*/include %{_libdir}/erlang/erts-*/lib/ %{_libdir}/erlang/erts-*/src/ @@ -1214,8 +1445,6 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man1/run_erl.* %{_mandir}/man1/start.* %{_mandir}/man1/start_erl.* -%{_mandir}/man3/atomics.* -%{_mandir}/man3/counters.* %{_mandir}/man3/driver_entry.* %{_mandir}/man3/erl_driver.* %{_mandir}/man3/erl_nif.* @@ -1224,19 +1453,16 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/erlang.* %{_mandir}/man3/erts_alloc.* %{_mandir}/man3/init.* -%{_mandir}/man3/net.* -%{_mandir}/man3/persistent_term.* -%{_mandir}/man3/scheduler.* -%{_mandir}/man3/socket.* %{_mandir}/man3/zlib.* %endif %{_libdir}/erlang/releases/* %{_libdir}/erlang/usr/ +%if ! (0%{?rhel} && 0%{?rhel} <= 6) %{_unitdir}/epmd.service %{_unitdir}/epmd.socket %{_unitdir}/epmd@.service %{_unitdir}/epmd@.socket -%{_sysusersdir}/erlang.conf +%endif %if %{__with_wxwidgets} %files et @@ -1250,7 +1476,7 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/et_selector.* %{_mandir}/man3/et_viewer.* %endif -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} %files eunit %dir %{_libdir}/erlang/lib/eunit-*/ @@ -1268,20 +1494,22 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_libdir}/erlang/lib/diameter-*/examples/ %if %{__with_wxwidgets} %{_libdir}/erlang/lib/et-*/examples/ -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} %{_libdir}/erlang/lib/eunit-*/examples/ +%if %{__with_java} +%{_libdir}/erlang/lib/ic-*/examples/ +%endif %{__with_java} %{_libdir}/erlang/lib/inets-*/examples/ %{_libdir}/erlang/lib/kernel-*/examples/ -%if %{__with_wxwidgets} %{_libdir}/erlang/lib/megaco-*/examples/ -%endif # __with_wxwidgets %{_libdir}/erlang/lib/mnesia-*/examples/ %if %{__with_wxwidgets} %{_libdir}/erlang/lib/observer-*/examples/ -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} +%{_libdir}/erlang/lib/orber-*/examples/ %if %{__with_wxwidgets} %{_libdir}/erlang/lib/reltool-*/examples/ -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} %{_libdir}/erlang/lib/runtime_tools-*/examples/ %{_libdir}/erlang/lib/sasl-*/examples/ %{_libdir}/erlang/lib/snmp-*/examples/ @@ -1291,20 +1519,29 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_libdir}/erlang/lib/tools-*/examples/ %if %{__with_wxwidgets} %{_libdir}/erlang/lib/wx-*/examples/ -%endif # __with_wxwidgets -%endif # __with_examples +%endif %{__with_wxwidgets} +%endif %{__with_examples} -%files ftp -%dir %{_libdir}/erlang/lib/ftp-*/ -%{_libdir}/erlang/lib/ftp-*/ebin -%{_libdir}/erlang/lib/ftp-*/src +%files hipe +%{_libdir}/erlang/lib/hipe-*/ + +%files ic +%dir %{_libdir}/erlang/lib/ic-*/ +%{_libdir}/erlang/lib/ic-*/ebin +%{_libdir}/erlang/lib/ic-*/include +%{_libdir}/erlang/lib/ic-*/priv +%{_libdir}/erlang/lib/ic-*/src +%if %{__with_java} +# FIXME see also erlang-jinterface +%dir %{_javadir}/%{name}/ +%{_javadir}/%{name}/ic.jar +%endif %{__with_java} %if %{with doc} -%{_mandir}/man3/ftp.* +%{_mandir}/man3/ic.* +%{_mandir}/man3/ic_clib.* +%{_mandir}/man3/ic_c_protocol.* %endif -%files gdb-tools -%{_libdir}/gdb/jit-reader.so - %files inets %dir %{_libdir}/erlang/lib/inets-*/ %{_libdir}/erlang/lib/inets-*/ebin @@ -1329,13 +1566,11 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %if %{__with_java} %files jinterface +# FIXME see also erlang-ic %dir %{_javadir}/%{name}/ %{_javadir}/%{name}/OtpErlang.jar %{_libdir}/erlang/lib/jinterface-*/ -%if %{with doc} -%{_mandir}/man3/jinterface.* -%endif -%endif # __with_java +%endif %{__with_java} %files kernel %dir %{_libdir}/erlang/lib/kernel-*/ @@ -1349,10 +1584,8 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/disk_log.* %{_mandir}/man3/erl_boot_server.* %{_mandir}/man3/erl_ddll.* -%{_mandir}/man3/erl_epmd.* %{_mandir}/man3/erl_prim_loader_stub.* %{_mandir}/man3/erlang_stub.* -%{_mandir}/man3/erpc.* %{_mandir}/man3/error_handler.* %{_mandir}/man3/error_logger.* %{_mandir}/man3/file.* @@ -1365,17 +1598,13 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/inet.* %{_mandir}/man3/inet_res.* %{_mandir}/man3/init_stub.* -%{_mandir}/man3/logger.* -%{_mandir}/man3/logger_disk_log_h.* -%{_mandir}/man3/logger_filters.* -%{_mandir}/man3/logger_formatter.* -%{_mandir}/man3/logger_std_h.* %{_mandir}/man3/net_adm.* %{_mandir}/man3/net_kernel.* %{_mandir}/man3/os.* -%{_mandir}/man3/pg.* +%{_mandir}/man3/pg2.* %{_mandir}/man3/rpc.* %{_mandir}/man3/seq_trace.* +%{_mandir}/man3/user.* %{_mandir}/man3/wrap_log_reader.* %{_mandir}/man3/zlib_stub.* %{_mandir}/man4/app.* @@ -1404,7 +1633,7 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/megaco_udp.* %{_mandir}/man3/megaco_user.* %endif -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} %files mnesia %dir %{_libdir}/erlang/lib/mnesia-*/ @@ -1431,7 +1660,7 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/ttb.* %{_mandir}/man6/observer.* %endif -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} %files odbc %{_libdir}/erlang/lib/odbc-*/ @@ -1439,16 +1668,51 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/odbc.* %endif +%files orber +%dir %{_libdir}/erlang/lib/orber-*/ +%{_libdir}/erlang/lib/orber-*/COSS +%{_libdir}/erlang/lib/orber-*/ebin +%{_libdir}/erlang/lib/orber-*/include +%{_libdir}/erlang/lib/orber-*/java_src +%{_libdir}/erlang/lib/orber-*/priv +%{_libdir}/erlang/lib/orber-*/src +%if %{with doc} +%{_mandir}/man3/CosNaming.* +%{_mandir}/man3/CosNaming_BindingIterator.* +%{_mandir}/man3/CosNaming_NamingContext.* +%{_mandir}/man3/CosNaming_NamingContextExt.* +%{_mandir}/man3/Module_Interface.* +%{_mandir}/man3/any.* +%{_mandir}/man3/corba.* +%{_mandir}/man3/corba_object.* +%{_mandir}/man3/fixed.* +%{_mandir}/man3/interceptors.* +%{_mandir}/man3/lname.* +%{_mandir}/man3/lname_component.* +%{_mandir}/man3/orber.* +%{_mandir}/man3/orber_acl.* +%{_mandir}/man3/orber_diagnostics.* +%{_mandir}/man3/orber_ifr.* +%{_mandir}/man3/orber_tc.* +%endif + %files os_mon %{_libdir}/erlang/lib/os_mon-*/ %if %{with doc} %{_mandir}/man3/cpu_sup.* %{_mandir}/man3/disksup.* %{_mandir}/man3/memsup.* +%{_mandir}/man3/os_mon_mib.* %{_mandir}/man3/os_sup.* %{_mandir}/man6/os_mon.* %endif +%files otp_mibs +%{_libdir}/erlang/lib/otp_mibs-*/ +%if %{with doc} +%{_mandir}/man3/otp_mib.* +%endif + %files parsetools %{_libdir}/erlang/lib/parsetools-*/ %if %{with doc} @@ -1471,7 +1735,7 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %if %{with doc} %{_mandir}/man3/reltool.* %endif -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} %files runtime_tools %dir %{_libdir}/erlang/lib/runtime_tools-*/ @@ -1481,6 +1745,7 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %if %{with doc} %{_mandir}/man3/dbg.* %{_mandir}/man3/dyntrace.* +%{_mandir}/man3/erts_alloc_config.* %{_mandir}/man3/msacc.* %{_mandir}/man3/system_information.* %{_mandir}/man6/runtime_tools.* @@ -1564,13 +1829,6 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man7/TRANSPORT-ADDRESS-MIB.* %endif -%if %{__with_sources} -%files src -%dir %{_libdir}/erlang/lib/*/src/ -%{_libdir}/erlang/lib/*/src/*.erl -%{_libdir}/erlang/lib/*/src/*.yrl -%endif - %files ssh %dir %{_libdir}/erlang/lib/ssh-*/ %{_libdir}/erlang/lib/ssh-*/ebin @@ -1578,16 +1836,13 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_libdir}/erlang/lib/ssh-*/src %if %{with doc} %{_mandir}/man3/ssh.* -%{_mandir}/man3/ssh_agent.* -%{_mandir}/man3/ssh_client_channel.* +%{_mandir}/man3/ssh_channel.* %{_mandir}/man3/ssh_client_key_api.* %{_mandir}/man3/ssh_connection.* -%{_mandir}/man3/ssh_file.* -%{_mandir}/man3/ssh_server_channel.* %{_mandir}/man3/ssh_server_key_api.* %{_mandir}/man3/ssh_sftp.* %{_mandir}/man3/ssh_sftpd.* -%{_mandir}/man6/SSH.* +%{_mandir}/man6/ssh.* %endif %files ssl @@ -1608,7 +1863,6 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_libdir}/erlang/lib/stdlib-*/include %{_libdir}/erlang/lib/stdlib-*/src %if %{with doc} -%{_mandir}/man3/argparse.* %{_mandir}/man3/array.* %{_mandir}/man3/base64.* %{_mandir}/man3/beam_lib.* @@ -1619,14 +1873,10 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/dict.* %{_mandir}/man3/digraph.* %{_mandir}/man3/digraph_utils.* -%{_mandir}/man3/edlin.* -%{_mandir}/man3/edlin_expand.* %{_mandir}/man3/epp.* %{_mandir}/man3/erl_anno.* -%{_mandir}/man3/erl_error.* %{_mandir}/man3/erl_eval.* %{_mandir}/man3/erl_expand_records.* -%{_mandir}/man3/erl_features.* %{_mandir}/man3/erl_id_trans.* %{_mandir}/man3/erl_internal.* %{_mandir}/man3/erl_lint.* @@ -1646,6 +1896,7 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/gen_statem.* %{_mandir}/man3/io.* %{_mandir}/man3/io_lib.* +%{_mandir}/man3/lib.* %{_mandir}/man3/lists.* %{_mandir}/man3/log_mf_h.* %{_mandir}/man3/maps.* @@ -1653,7 +1904,6 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/ms_transform.* %{_mandir}/man3/orddict.* %{_mandir}/man3/ordsets.* -%{_mandir}/man3/peer.* %{_mandir}/man3/pool.* %{_mandir}/man3/proc_lib.* %{_mandir}/man3/proplists.* @@ -1665,7 +1915,6 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/sets.* %{_mandir}/man3/shell.* %{_mandir}/man3/shell_default.* -%{_mandir}/man3/shell_docs.* %{_mandir}/man3/slave.* %{_mandir}/man3/sofs.* %{_mandir}/man3/string.* @@ -1674,7 +1923,6 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/sys.* %{_mandir}/man3/timer.* %{_mandir}/man3/unicode.* -%{_mandir}/man3/uri_string.* %{_mandir}/man3/zip.* %{_mandir}/man6/stdlib.* %endif @@ -1690,25 +1938,19 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/erl_recomment.* %{_mandir}/man3/erl_syntax.* %{_mandir}/man3/erl_syntax_lib.* +%{_mandir}/man3/erl_tidy.* +%{_mandir}/man3/igor.* %{_mandir}/man3/merl.* %{_mandir}/man3/merl_transform.* %{_mandir}/man3/prettypr.* %endif -%files tftp -%dir %{_libdir}/erlang/lib/tftp-*/ -%{_libdir}/erlang/lib/tftp-*/ebin -%{_libdir}/erlang/lib/tftp-*/src -%if %{with doc} -%{_mandir}/man3/tftp.* -%endif - %files tools %dir %{_libdir}/erlang/lib/tools-*/ +%{_libdir}/erlang/lib/tools-*/bin %{_libdir}/erlang/lib/tools-*/ebin %{_libdir}/erlang/lib/tools-*/emacs %{_libdir}/erlang/lib/tools-*/src -%{_libdir}/erlang/lib/tools-*/priv %if %{with doc} %{_mandir}/man3/cover.* %{_mandir}/man3/cprof.* @@ -1727,7 +1969,14 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_emacs_sitelispdir}/erlang/*.el %{_emacs_sitelispdir}/erlang/*.elc %{_emacs_sitestartdir}/erlang-init.el -%endif # __with_emacs +%endif %{__with_emacs} +%if %{__with_xemacs} +%dir %{_xemacs_sitelispdir}/erlang +%doc %{_xemacs_sitelispdir}/erlang/README +%{_xemacs_sitelispdir}/erlang/*.el +%{_xemacs_sitelispdir}/erlang/*.elc +%{_xemacs_sitestartdir}/erlang-init.el +%endif %{__with_xemacs} %if %{__with_wxwidgets} %files wx @@ -1740,6 +1989,8 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/gl.* %{_mandir}/man3/glu.* %{_mandir}/man3/wx.* +%{_mandir}/man3/wx_misc.* +%{_mandir}/man3/wx_object.* %{_mandir}/man3/wxAcceleratorEntry.* %{_mandir}/man3/wxAcceleratorTable.* %{_mandir}/man3/wxActivateEvent.* @@ -1755,8 +2006,6 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/wxBitmap.* %{_mandir}/man3/wxBitmapButton.* %{_mandir}/man3/wxBitmapDataObject.* -%{_mandir}/man3/wxBookCtrlBase.* -%{_mandir}/man3/wxBookCtrlEvent.* %{_mandir}/man3/wxBoxSizer.* %{_mandir}/man3/wxBrush.* %{_mandir}/man3/wxBufferedDC.* @@ -1785,15 +2034,14 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/wxControl.* %{_mandir}/man3/wxControlWithItems.* %{_mandir}/man3/wxCursor.* -%{_mandir}/man3/wxDC.* -%{_mandir}/man3/wxDCOverlay.* %{_mandir}/man3/wxDataObject.* %{_mandir}/man3/wxDateEvent.* %{_mandir}/man3/wxDatePickerCtrl.* +%{_mandir}/man3/wxDC.* +%{_mandir}/man3/wxDCOverlay.* %{_mandir}/man3/wxDialog.* %{_mandir}/man3/wxDirDialog.* %{_mandir}/man3/wxDirPickerCtrl.* -%{_mandir}/man3/wxDisplay.* %{_mandir}/man3/wxDisplayChangedEvent.* %{_mandir}/man3/wxDropFilesEvent.* %{_mandir}/man3/wxEraseEvent.* @@ -1813,16 +2061,13 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/wxFontPickerCtrl.* %{_mandir}/man3/wxFontPickerEvent.* %{_mandir}/man3/wxFrame.* -%{_mandir}/man3/wxGBSizerItem.* -%{_mandir}/man3/wxGCDC.* -%{_mandir}/man3/wxGLCanvas.* -%{_mandir}/man3/wxGLContext.* %{_mandir}/man3/wxGauge.* +%{_mandir}/man3/wxGBSizerItem.* %{_mandir}/man3/wxGenericDirCtrl.* +%{_mandir}/man3/wxGLCanvas.* %{_mandir}/man3/wxGraphicsBrush.* %{_mandir}/man3/wxGraphicsContext.* %{_mandir}/man3/wxGraphicsFont.* -%{_mandir}/man3/wxGraphicsGradientStops.* %{_mandir}/man3/wxGraphicsMatrix.* %{_mandir}/man3/wxGraphicsObject.* %{_mandir}/man3/wxGraphicsPath.* @@ -1858,20 +2103,20 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/wxJoystickEvent.* %{_mandir}/man3/wxKeyEvent.* %{_mandir}/man3/wxLayoutAlgorithm.* +%{_mandir}/man3/wxListbook.* %{_mandir}/man3/wxListBox.* %{_mandir}/man3/wxListCtrl.* %{_mandir}/man3/wxListEvent.* %{_mandir}/man3/wxListItem.* %{_mandir}/man3/wxListItemAttr.* %{_mandir}/man3/wxListView.* -%{_mandir}/man3/wxListbook.* %{_mandir}/man3/wxLocale.* %{_mandir}/man3/wxLogNull.* +%{_mandir}/man3/wxMask.* +%{_mandir}/man3/wxMaximizeEvent.* %{_mandir}/man3/wxMDIChildFrame.* %{_mandir}/man3/wxMDIClientWindow.* %{_mandir}/man3/wxMDIParentFrame.* -%{_mandir}/man3/wxMask.* -%{_mandir}/man3/wxMaximizeEvent.* %{_mandir}/man3/wxMemoryDC.* %{_mandir}/man3/wxMenu.* %{_mandir}/man3/wxMenuBar.* @@ -1887,7 +2132,7 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/wxMultiChoiceDialog.* %{_mandir}/man3/wxNavigationKeyEvent.* %{_mandir}/man3/wxNotebook.* -%{_mandir}/man3/wxNotificationMessage.* +%{_mandir}/man3/wxNotebookEvent.* %{_mandir}/man3/wxNotifyEvent.* %{_mandir}/man3/wxOverlay.* %{_mandir}/man3/wxPageSetupDialog.* @@ -1909,9 +2154,9 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/wxPrintData.* %{_mandir}/man3/wxPrintDialog.* %{_mandir}/man3/wxPrintDialogData.* -%{_mandir}/man3/wxPrintPreview.* %{_mandir}/man3/wxPrinter.* %{_mandir}/man3/wxPrintout.* +%{_mandir}/man3/wxPrintPreview.* %{_mandir}/man3/wxProgressDialog.* %{_mandir}/man3/wxQueryNewPaletteEvent.* %{_mandir}/man3/wxRadioBox.* @@ -1922,9 +2167,9 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/wxSashWindow.* %{_mandir}/man3/wxScreenDC.* %{_mandir}/man3/wxScrollBar.* +%{_mandir}/man3/wxScrolledWindow.* %{_mandir}/man3/wxScrollEvent.* %{_mandir}/man3/wxScrollWinEvent.* -%{_mandir}/man3/wxScrolledWindow.* %{_mandir}/man3/wxSetCursorEvent.* %{_mandir}/man3/wxShowEvent.* %{_mandir}/man3/wxSingleChoiceDialog.* @@ -1959,24 +2204,20 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/wxTextEntryDialog.* %{_mandir}/man3/wxToggleButton.* %{_mandir}/man3/wxToolBar.* -%{_mandir}/man3/wxToolTip.* %{_mandir}/man3/wxToolbook.* +%{_mandir}/man3/wxToolTip.* %{_mandir}/man3/wxTopLevelWindow.* +%{_mandir}/man3/wxTreebook.* %{_mandir}/man3/wxTreeCtrl.* %{_mandir}/man3/wxTreeEvent.* -%{_mandir}/man3/wxTreebook.* %{_mandir}/man3/wxUpdateUIEvent.* -%{_mandir}/man3/wxWebView.* -%{_mandir}/man3/wxWebViewEvent.* %{_mandir}/man3/wxWindow.* %{_mandir}/man3/wxWindowCreateEvent.* %{_mandir}/man3/wxWindowDC.* %{_mandir}/man3/wxWindowDestroyEvent.* %{_mandir}/man3/wxXmlResource.* -%{_mandir}/man3/wx_misc.* -%{_mandir}/man3/wx_object.* %endif -%endif # __with_wxwidgets +%endif %{__with_wxwidgets} %files xmerl %{_libdir}/erlang/lib/xmerl-*/ @@ -1992,460 +2233,30 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %changelog -* Wed Sep 10 2025 Peter Lemenkov - 26.2.5.15-1 -- Ver. 26.2.5.15 +* Wed Nov 20 2019 Peter Lemenkov - 20.3.8.24-1 +- Ver. 20.3.8.24 -* Wed Jul 23 2025 Fedora Release Engineering - 26.2.5.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild +* Wed Nov 13 2019 Peter Lemenkov - 20.3.8.23-1 +- Ver. 20.3.8.23 -* Thu Jul 17 2025 Peter Lemenkov - 26.2.5.14-1 -- Ver. 26.2.5.14 +* Wed Jun 19 2019 Peter Lemenkov - 20.3.8.22-1 +- Ver. 20.3.8.22 -* Fri Jun 20 2025 Peter Lemenkov - 26.2.5.13-3 -- Add GDB tools +* Wed Apr 17 2019 Peter Lemenkov - 20.3.8.21-1 +- Ver. 20.3.8.21 -* Wed Jun 18 2025 Benjamin A. Beasley - 26.2.5.13-2 -- Rename typer (in /usr/bin) to erlang-typer; fixes RHBZ#2359567 +* Tue Feb 19 2019 Peter Lemenkov - 20.3.8.20-1 +- Ver. 20.3.8.20 -* Mon Jun 16 2025 Peter Lemenkov - 26.2.5.13-1 -- Ver. 26.2.5.13 +* Fri Feb 15 2019 Peter Lemenkov - 20.3.8.19-1 +- Ver. 20.3.8.19 -* Thu May 8 2025 Peter Lemenkov - 26.2.5.12-1 -- Ver. 26.2.5.12 +* Tue Feb 12 2019 Peter Lemenkov - 20.3.8.18-3 +- Revert latest patch - does too much damage -* Wed Apr 16 2025 Peter Lemenkov - 26.2.5.11-1 -- Ver. 26.2.5.11 - -* Fri Mar 28 2025 Peter Lemenkov - 26.2.5.10-1 -- Ver. 26.2.5.10 - -* Mon Mar 10 2025 Zbigniew Jedrzejewski-Szmek - 26.2.5.9-2 -- Add sysusers.d config file to allow rpm to create users/groups automatically - -* Thu Feb 13 2025 Peter Lemenkov - 26.2.5.8-1 -- Ver. 26.2.5.8 - -* Tue Feb 11 2025 Peter Lemenkov - 26.2.5.7-1 -- Ver. 26.2.5.7 - -* Thu Jan 16 2025 Fedora Release Engineering - 26.2.5.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Dec 7 2024 Peter Lemenkov - 26.2.5.6-1 -- Ver. 26.2.5.6 - -* Fri Nov 1 2024 Peter Lemenkov - 26.2.5.5-1 -- Ver. 26.2.5.5 - -* Wed Oct 9 2024 Peter Lemenkov - 26.2.5.4-1 -- Ver. 26.2.5.4 - -* Thu Sep 5 2024 Peter Lemenkov - 26.2.5.3-1 -- Ver. 26.2.5.3 - -* Wed Jul 17 2024 Fedora Release Engineering - 26.2.5.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jul 10 2024 Peter Lemenkov - 26.2.5.2-1 -- Ver. 26.2.5.2 - -* Wed Jun 26 2024 Peter Lemenkov - 26.2.5.1-1 -- Ver. 26.2.5.1 - -* Sat May 4 2024 Peter Lemenkov - 26.2.5-1 -- Ver. 26.2.5 - -* Sat Apr 13 2024 Peter Lemenkov - 26.2.4-1 -- Ver. 26.2.4 - -* Mon Feb 12 2024 Peter Lemenkov - 26.2.2-1 -- Ver. 26.2.2 - -* Wed Jan 24 2024 Fedora Release Engineering - 26.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 26.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Dec 18 2023 Peter Lemenkov - 26.2.1-1 -- Ver. 26.2.1 - -* Wed Dec 13 2023 Peter Lemenkov - 26.2-1 -- Ver. 26.2 - -* Fri Oct 13 2023 Peter Lemenkov - 26.1.2-1 -- Ver. 26.1.2 - -* Fri Sep 29 2023 Peter Lemenkov - 26.1.1-1 -- Ver. 26.1.1 - -* Wed Sep 20 2023 Peter Lemenkov - 26.1-1 -- Ver. 26.1 - -* Tue Aug 8 2023 Peter Lemenkov - 26.0.2-3 -- Reenable OpenSSL 3 - -* Wed Jul 19 2023 Fedora Release Engineering - 26.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jul 1 2023 Peter Lemenkov - 26.0.2-1 -- Ver. 26.0.2 - -* Fri Jun 9 2023 Peter Lemenkov - 26.0.1-1 -- Ver. 26.0.1 - -* Sat May 20 2023 Peter Lemenkov - 26.0-1 -- Ver. 26.0 - -* Sat May 6 2023 Peter Lemenkov - 25.3.2-1 -- Ver. 25.3.2 - -* Thu Apr 27 2023 Peter Lemenkov - 25.3.1-1 -- Ver. 25.3.1 - -* Wed Mar 8 2023 Peter Lemenkov - 25.3-1 -- Ver. 25.3 - -* Fri Feb 17 2023 Peter Lemenkov - 25.2.3-1 -- Ver. 25.2.3 - -* Mon Jan 30 2023 Peter Lemenkov - 25.2.2-1 -- Ver. 25.2.2 - -* Thu Jan 19 2023 Fedora Release Engineering - 25.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jan 18 2023 Peter Lemenkov - 25.2.1-1 -- Ver. 25.2.1 - -* Fri Jan 6 2023 Peter Lemenkov - 25.2-3 -- Fix deps - -* Wed Jan 4 2023 Peter Lemenkov - 25.2-2 -- LSP applications require source code to be available (rhbz #2157170). Let's - restore it in a separate package - -* Wed Dec 14 2022 Peter Lemenkov - 25.2-1 -- Ver. 25.2 - -* Sun Nov 27 2022 Mamoru TASAKA - 25.1.2-3 -- Rebuild due to wxGLCanvas ABI change - -* Thu Nov 24 2022 Florian Weimer - 25.1.2-2 -- Fix C99 compatibility issues in configure checks - -* Tue Oct 25 2022 Peter Lemenkov - 25.1.2-1 -- Ver. 25.1.2 - -* Mon Oct 3 2022 Peter Lemenkov - 25.1.1-1 -- Ver. 25.1.1 - -* Wed Sep 21 2022 Peter Lemenkov - 25.1-1 -- Ver. 25.1 - -* Thu Aug 18 2022 Peter Lemenkov - 25.0.4-1 -- Ver. 25.0.4 - -* Thu Jul 28 2022 Peter Lemenkov - 25.0.3-3 -- Rebuild with new wxWidgets - -* Thu Jul 21 2022 Fedora Release Engineering - 25.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jul 16 2022 Peter Lemenkov - 25.0.3-1 -- Ver. 25.0.3 - -* Tue Jul 12 2022 Peter Lemenkov - 25.0.2-1 -- Ver. 25.0.2 - -* Thu Jun 23 2022 Peter Lemenkov - 24.3.4.2-1 -- Ver. 24.3.4.2 - -* Wed Jun 8 2022 Peter Lemenkov - 24.3.4.1-1 -- Ver. 24.3.4.1 - -* Tue May 24 2022 Peter Lemenkov - 24.3.4-2 -- Downgrade to OpenSSL 1.x - -* Wed May 4 2022 Peter Lemenkov - 24.3.4-1 -- Ver. 24.3.4 - -* Fri Apr 8 2022 Peter Lemenkov - 24.3.3-2 -- Temporarily disable FIPS (doesn't work reliably with OpenSSL 3.0 yet) - -* Tue Mar 29 2022 Peter Lemenkov - 24.3.3-1 -- Ver. 24.3.3 -- Doc sub-package no longermarked as noarch (contains links to _libdir) - -* Mon Mar 28 2022 John Eckersberg - 24.2.2-2 -- Keep documentation chunks in the code path (rhbz#2068758) - -* Tue Mar 1 2022 Peter Lemenkov - 24.2.2-1 -- Ver. 24.2.2 - -* Sat Feb 05 2022 Jiri Vanek - 24.2.1-2 -- Rebuilt for java-17-openjdk as system jdk - -* Wed Jan 26 2022 Peter Lemenkov - 24.2.1-1 -- Ver. 24.2.1 - -* Thu Jan 20 2022 Fedora Release Engineering - 24.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Dec 15 2021 Peter Lemenkov - 24.2-1 -- Ver. 24.2 - -* Mon Nov 22 2021 Peter Lemenkov - 24.1.7-1 -- Ver. 24.1.7 - -* Thu Nov 18 2021 Peter Lemenkov - 24.1.6-1 -- Ver. 24.1.6 - -* Sat Nov 13 2021 Peter Lemenkov - 24.1.5-1 -- Ver. 24.1.5 - -* Tue Nov 2 2021 Peter Lemenkov - 24.1.4-1 -- Ver. 24.1.4 - -* Thu Oct 28 2021 Peter Lemenkov - 24.1.3-1 -- Ver. 24.1.3 - -* Tue Oct 12 2021 Peter Lemenkov - 24.1.2-2 -- Fix FTBFS with OpenSSL 3.0 - -* Tue Oct 5 2021 Peter Lemenkov - 24.1.2-1 -- Ver. 24.1.2 - -* Mon Oct 4 2021 Peter Lemenkov - 24.1.1-1 -- Ver. 24.1.1 - -* Thu Sep 23 2021 Peter Lemenkov - 24.1-1 -- Ver. 24.1 - -* Tue Sep 14 2021 Sahana Prasad - 24.0.6-2 -- Rebuilt with OpenSSL 3.0.0 - -* Fri Sep 3 2021 Peter Lemenkov - 24.0.6-1 -- Ver. 24.0.6 - -* Tue Aug 3 2021 Peter Lemenkov - 24.0.5-1 -- Ver. 24.0.5 - -* Thu Jul 22 2021 Peter Lemenkov - 24.0.4-1 -- Ver. 24.0.4 - -* Wed Jul 21 2021 Fedora Release Engineering - 24.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jun 29 2021 Peter Lemenkov - 24.0.3-1 -- Ver. 24.0.3 - -* Tue Jun 01 2021 Peter Lemenkov - 24.0.2-1 -- Ver. 24.0.2 - -* Fri May 21 2021 John Eckersberg - 24.0.1-1 -- Ver. 24.0.1 - -* Wed May 12 2021 Peter Lemenkov - 24.0-1 -- Ver. 24.0 - -* Wed Apr 21 2021 Peter Lemenkov - 24.0-0.2.rc3 -- Ver. 24.0-rc3 - -* Sat Apr 3 2021 Peter Lemenkov - 24.0-0.1.rc2 -- Ver. 24.0-rc2 -- Removed hipe - -* Tue Mar 30 2021 Peter Lemenkov - 23.3.1-1 -- Ver. 23.3.1 - -* Wed Mar 24 2021 Peter Lemenkov - 23.3-1 -- Ver. 23.3 - -* Fri Mar 5 2021 Peter Lemenkov - 23.2.7-1 -- Ver. 23.2.7 - -* Thu Feb 25 2021 Peter Lemenkov - 23.2.6-1 -- Ver. 23.2.6 - -* Tue Feb 16 2021 Peter Lemenkov - 23.2.5-1 -- Ver. 23.2.5 - -* Thu Feb 4 2021 John Eckersberg - 23.2.4-1 -- Ver. 23.2.4 - -* Tue Jan 26 2021 Fedora Release Engineering - 23.2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jan 20 2021 Peter Lemenkov - 23.2.3-1 -- Ver. 23.2.3 - -* Fri Jan 15 2021 Peter Lemenkov - 23.2.2-1 -- Ver. 23.2.2 -- Disable XEmacs support (dead upstream, scheduled for removal from Fedora) - -* Tue Dec 22 2020 Peter Lemenkov - 23.2.1-1 -- Ver. 23.2.1 - -* Thu Dec 17 2020 Peter Lemenkov - 23.2-1 -- Ver. 23.2 - -* Fri Dec 11 2020 Peter Lemenkov - 23.1.5-1 -- Ver. 23.1.5 - -* Fri Nov 20 2020 Peter Lemenkov - 23.1.4-1 -- Ver. 23.1.4 - -* Tue Nov 17 2020 Peter Lemenkov - 23.1.3-1 -- Ver. 23.1.3 - -* Sat Oct 3 2020 Peter Lemenkov - 23.1.1-1 -- Ver. 23.1.1 - -* Tue Sep 15 2020 Peter Lemenkov - 23.0.4-1 -- Ver. 23.0.4 - -* Mon Jul 27 2020 Fedora Release Engineering - 23.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 20 2020 Peter Lemenkov - 23.0.3-1 -- Ver. 23.0.3 - -* Fri Jul 10 2020 Jiri Vanek - 23.0.2-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Thu May 28 2020 Peter Lemenkov - 23.0.2-1 -- Ver. 23.0.2 - -* Wed May 20 2020 Peter Lemenkov - 23.0.1-1 -- Ver. 23.0.1 - -* Wed May 13 2020 Peter Lemenkov - 23.0-1 -- Ver. 23.0 - -* Thu Apr 23 2020 Peter Lemenkov - 23.0-0.2.rc3 -- Ver. 23.0-rc3 - -* Sun Apr 19 2020 Peter Lemenkov - 23.0-0.1.rc2 -- Ver. 23.0-rc2 - -* Thu Apr 9 2020 Peter Lemenkov - 22.3.2-1 -- Ver. 22.3.2 - -* Fri Feb 28 2020 Peter Lemenkov - 22.2.8-1 -- Ver. 22.2.8 - -* Fri Feb 21 2020 Peter Lemenkov - 22.2.7-2 -- Fix building with GCC 10 (-fno-common) - -* Fri Feb 21 2020 Peter Lemenkov - 22.2.7-1 -- Ver. 22.2.7 - -* Thu Feb 6 2020 Peter Lemenkov - 22.2.6-1 -- Ver. 22.2.6 - -* Tue Jan 28 2020 Fedora Release Engineering - 22.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Jan 13 2020 Peter Lemenkov - 22.2.2-1 -- Ver. 22.2.2 - -* Sat Dec 28 2019 Peter Lemenkov - 22.2.1-1 -- Ver. 22.2.1 - -* Thu Nov 21 2019 John Eckersberg - 22.1.8-1 -- Ver. 22.1.8 -- Re-enable s390x, but disable kernel polling, see rhbz#1770256 - -* Mon Nov 11 2019 John Eckersberg - 22.1.7-1 -- Ver. 22.1.7 -- Add ExcludeArch for s390x, see rhbz#1770256 - -* Tue Nov 5 2019 John Eckersberg - 22.1.5-1 -- Ver. 22.1.5 - -* Mon Sep 16 2019 Peter Lemenkov - 22.0.7-3 -- Enable arches disabled in a previous build - -* Wed Sep 11 2019 Peter Lemenkov - 22.0.7-2 -- Disable arches with a broken builders -- Expose a correct NIF API version - -* Tue Jul 30 2019 Peter Lemenkov - 22.0.7-1 -- Ver. 22.0.7 -- Removed otp_mibs application - -* Wed Jul 24 2019 Fedora Release Engineering - 21.3.8.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jul 15 2019 Peter Lemenkov - 21.3.8.6-1 -- Ver. 21.3.8.6 - -* Mon Jul 8 2019 Peter Lemenkov - 21.3.8.5-1 -- Ver. 21.3.8.5 - -* Wed Jun 19 2019 Peter Lemenkov - 21.3.8.4-1 -- Ver. 21.3.8.4 - -* Tue Jun 04 2019 Peter Lemenkov - 21.3.8.3-1 -- Ver. 21.3.8.3 - -* Mon May 20 2019 Peter Lemenkov - 21.3.8.2-1 -- Ver. 21.3.8.2 - -* Fri May 17 2019 Peter Lemenkov - 21.3.8.1-1 -- Ver. 21.3.8.1 - -* Wed May 01 2019 Peter Lemenkov - 21.3.7-1 -- Ver. 21.3.7 - -* Thu Apr 18 2019 Peter Lemenkov - 21.3.6-1 -- Ver. 21.3.6 - -* Mon Apr 15 2019 Peter Lemenkov - 21.3.5-1 -- Ver. 21.3.5 - -* Sat Apr 13 2019 Peter Lemenkov - 21.3.4-1 -- Ver. 21.3.4 - -* Tue Apr 02 2019 Peter Lemenkov - 21.3.3-1 -- Ver. 21.3.3 - -* Fri Mar 22 2019 Peter Lemenkov - 21.3.2-1 -- Ver. 21.3.2 - -* Tue Mar 19 2019 Peter Lemenkov - 21.3.1-1 -- Ver. 21.3.1 - -* Tue Mar 12 2019 Peter Lemenkov - 21.3-1 -- Ver. 21.3 - -* Thu Mar 07 2019 Peter Lemenkov - 21.2.7-1 -- Ver. 21.2.7 - -* Tue Feb 19 2019 Kalev Lember - 21.2.6-2 -- Rebuilt against fixed atk (#1626575) - -* Tue Feb 19 2019 Peter Lemenkov - 21.2.6-1 -- Ver. 21.2.6 - -* Tue Feb 05 2019 Peter Lemenkov - 21.2.5-1 -- Ver. 21.2.5 -- Revert: Fix EC detection - -* Mon Feb 04 2019 Peter Lemenkov - 21.2.4-2 +* Mon Feb 04 2019 Peter Lemenkov - 20.3.8.18-2 - Fix EC detection -* Thu Jan 31 2019 Peter Lemenkov - 21.2.4-1 -- Ver. 21.2.4 -- Removed cosEvent, cosEventDomain, cosFileTransfer, cosNotification, - cosProperty, cosTime, cosTransactions, ic, orber applications -- Added ftp, tftp applications -- Disabled XEmacs support (fails to build) - -* Thu Jan 31 2019 Fedora Release Engineering - 20.3.8.18-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - * Tue Jan 22 2019 Peter Lemenkov - 20.3.8.18-1 - Ver. 20.3.8.18 diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index 270792a..be12bd8 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Do not format man-pages and do not install miscellaneous Signed-off-by: Peter Lemenkov diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index 42af9c87dc..c017e0a4ed 100644 +index 5b1b9119ce..02535a78bc 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -552,10 +552,6 @@ endif +@@ -495,10 +495,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif @@ -21,10 +21,10 @@ index 42af9c87dc..c017e0a4ed 100644 $(INSTALL_DIR) "$(RELEASE_PATH)/erts-$(VSN)/src" $(INSTALL_DATA) $(INSTALL_SRC) "$(RELEASE_PATH)/erts-$(VSN)/src" diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src -index b00dd09f1a..2147774f50 100644 +index e4b842877c..382561821f 100644 --- a/erts/etc/unix/Install.src +++ b/erts/etc/unix/Install.src -@@ -143,14 +143,5 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot . +@@ -141,14 +141,5 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot . cp -p ../releases/%I_SYSTEM_VSN%/no_dot_erlang.boot . cp -p $Name.boot start.boot cp -p ../releases/%I_SYSTEM_VSN%/$Name.script start.script diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 5cadc0c..b05f9ce 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,15 +5,28 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index aedc9e7a13..b27c2aa01b 100644 +index 31124ba477..a4a6c158cc 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -147,7 +147,7 @@ endif - endif +@@ -96,7 +96,7 @@ endif + DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ - ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes) + ifeq ($(DYNAMIC_CRYPTO_LIB),yes) -SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@ +SSL_DED_LD_RUNTIME_LIBRARY_PATH = CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB else +diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile +index ff9d3e1dc9..d3aba77808 100644 +--- a/lib/crypto/priv/Makefile ++++ b/lib/crypto/priv/Makefile +@@ -61,7 +61,7 @@ OBJS = $(OBJDIR)/crypto.o + # ---------------------------------------------------- + + $(SO_NIFLIB): $(OBJS) +- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ ++ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ + -o $@ $^ -lcrypto + + $(DLL_NIFLIB): $(OBJS) diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 23056c4..71ee071 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -14,10 +14,10 @@ https://bugzilla.redhat.com/818419 Signed-off-by: Peter Lemenkov diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile -index 82a6b6e87a..5f2fe8ba7d 100644 +index 1f714df357..95835d6ed2 100644 --- a/lib/asn1/c_src/Makefile +++ b/lib/asn1/c_src/Makefile -@@ -137,8 +137,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -136,8 +136,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" $(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) "$(RELSYSDIR)/priv/lib" @@ -26,34 +26,76 @@ index 82a6b6e87a..5f2fe8ba7d 100644 release_docs_spec: +diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in +index a4a6c158cc..13658302f5 100644 +--- a/lib/crypto/c_src/Makefile.in ++++ b/lib/crypto/c_src/Makefile.in +@@ -216,16 +216,11 @@ docs: + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt +- $(INSTALL_DIR) "$(RELSYSDIR)/priv/obj" + $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" +- $(INSTALL_DATA) $(NIF_MAKEFILE) "$(RELSYSDIR)/priv/obj" +- $(INSTALL_PROGRAM) $(CRYPTO_OBJS) "$(RELSYSDIR)/priv/obj" + $(INSTALL_PROGRAM) $(NIF_LIB) "$(RELSYSDIR)/priv/lib" + ifeq ($(DYNAMIC_CRYPTO_LIB),yes) +- $(INSTALL_PROGRAM) $(CALLBACK_OBJS) "$(RELSYSDIR)/priv/obj" + $(INSTALL_PROGRAM) $(CALLBACK_LIB) "$(RELSYSDIR)/priv/lib" + endif +- $(INSTALL_PROGRAM) $(TEST_ENGINE_OBJS) "$(RELSYSDIR)/priv/obj" + $(INSTALL_PROGRAM) $(TEST_ENGINE_LIB) "$(RELSYSDIR)/priv/lib" + + release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index fa1ea3cd39..b977b6afe5 100644 +index 24a9b87aeb..640c80722f 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -715,13 +715,11 @@ ifeq (@DYNAMIC_LIB@, yes) - endif +@@ -844,14 +844,14 @@ ifneq ($(EXE_TARGETS),) $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" + endif $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" - $(INSTALL_DATA) connect/*.[ch] "$(RELSYSDIR)/src/connect" - $(INSTALL_DATA) decode/*.[ch] "$(RELSYSDIR)/src/decode" - $(INSTALL_DATA) encode/*.[ch] "$(RELSYSDIR)/src/encode" - $(INSTALL_DATA) epmd/*.[ch] "$(RELSYSDIR)/src/epmd" - $(INSTALL_DATA) misc/*.[ch] "$(RELSYSDIR)/src/misc" -- $(INSTALL_DATA) global/*.[ch] "$(RELSYSDIR)/src/global" +- $(INSTALL_DATA) registry/*.[ch] "$(RELSYSDIR)/src/registry" +- $(INSTALL_DATA) legacy/*.[ch] "$(RELSYSDIR)/src/legacy" - $(INSTALL_DATA) prog/*.[ch] "$(RELSYSDIR)/src/prog" + $(INSTALL_DATA) connect/*.h "$(RELSYSDIR)/src/connect" + $(INSTALL_DATA) decode/*.h "$(RELSYSDIR)/src/decode" + $(INSTALL_DATA) encode/*.h "$(RELSYSDIR)/src/encode" + $(INSTALL_DATA) epmd/*.h "$(RELSYSDIR)/src/epmd" + $(INSTALL_DATA) misc/*.h "$(RELSYSDIR)/src/misc" ++ $(INSTALL_DATA) registry/*.h "$(RELSYSDIR)/src/registry" ++ $(INSTALL_DATA) legacy/*.h "$(RELSYSDIR)/src/legacy" ++ $(INSTALL_DATA) prog/*.h "$(RELSYSDIR)/src/prog" release_docs: +diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in +index c0dad59557..9a19028ff3 100644 +--- a/lib/ic/c_src/Makefile.in ++++ b/lib/ic/c_src/Makefile.in +@@ -145,12 +145,10 @@ $(OBJDIR)/%.o: %.c + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt +- $(INSTALL_DIR) "$(RELSYSDIR)/c_src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" + $(INSTALL_DIR) "$(RELEASE_PATH)/usr/include" + $(INSTALL_DIR) "$(RELEASE_PATH)/usr/lib" +- $(INSTALL_DATA) ic.c ic_tmo.c "$(RELSYSDIR)/c_src" + $(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(LIBRARY) "$(RELSYSDIR)/priv/lib" + $(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELEASE_PATH)/usr/include" diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index 3649e2c392..d8c5c68b99 100644 +index c37ad4d702..09bf1efe95 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in -@@ -251,7 +251,7 @@ release_spec: opt +@@ -271,7 +271,7 @@ release_spec: opt $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) @@ -63,7 +105,7 @@ index 3649e2c392..d8c5c68b99 100644 endif diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in -index d1b26743a6..cf8faae1f5 100644 +index 784e73c47e..568c5e4c3e 100644 --- a/lib/odbc/c_src/Makefile.in +++ b/lib/odbc/c_src/Makefile.in @@ -129,11 +129,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -91,3 +133,16 @@ index 27b156a2c9..f11ff303b6 100644 $(INSTALL_DIR) "$(RELSYSDIR)/priv/bin" $(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin" +diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in +index 289322b6fa..9e2b9b7e7c 100644 +--- a/lib/tools/c_src/Makefile.in ++++ b/lib/tools/c_src/Makefile.in +@@ -189,8 +189,6 @@ include ../vsn.mk + RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN) + + release_spec: all +- $(INSTALL_DIR) "$(RELSYSDIR)/c_src" +- $(INSTALL_DATA) $(EMEM_SRCS) $(EMEM_HEADERS) "$(RELSYSDIR)/c_src" + ifneq ($(PROGS),) + $(INSTALL_DIR) "$(RELSYSDIR)/bin" + $(INSTALL_PROGRAM) $(PROGS) "$(RELSYSDIR)/bin" diff --git a/otp-0004-Do-not-install-Java-sources.patch b/otp-0004-Do-not-install-Java-sources.patch index a8037ea..8948d81 100644 --- a/otp-0004-Do-not-install-Java-sources.patch +++ b/otp-0004-Do-not-install-Java-sources.patch @@ -4,11 +4,24 @@ Subject: [PATCH] Do not install Java sources Signed-off-by: Peter Lemenkov +diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile +index 21c38e54b5..eeba2e4eae 100644 +--- a/lib/ic/java_src/com/ericsson/otp/ic/Makefile ++++ b/lib/ic/java_src/com/ericsson/otp/ic/Makefile +@@ -113,8 +113,6 @@ docs: + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt +- $(INSTALL_DIR) "$(RELSYSDIR)/java_src/com/ericsson/otp/ic" +- $(INSTALL_DATA) $(JAVA_FILES) "$(RELSYSDIR)/java_src/com/ericsson/otp/ic" + $(INSTALL_DIR) "$(RELSYSDIR)/priv" + $(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv" + diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile -index 089cf4ab1a..404654a437 100644 +index 001acfdd2e..35b2eb3446 100644 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile -@@ -123,8 +123,6 @@ release release_docs release_tests release_html: +@@ -120,8 +120,6 @@ release release_docs release_tests release_html: $(V_at)$(MAKE) $(MFLAGS) RELEASE_PATH="$(RELEASE_PATH)" $(TARGET_MAKEFILE) $@_spec release_spec: opt diff --git a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch index 1965881..50af2de 100644 --- a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch +++ b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32 Signed-off-by: Peter Lemenkov diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile -index 8e3882bfdc..ea999cf9c7 100644 +index 4aa8879a91..46dfde42f1 100644 --- a/lib/os_mon/doc/src/Makefile +++ b/lib/os_mon/doc/src/Makefile -@@ -31,11 +31,16 @@ APPLICATION=os_mon +@@ -36,12 +36,17 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN) # Target Specs # ---------------------------------------------------- XML_APPLICATION_FILES = ref_man.xml @@ -21,6 +21,7 @@ index 8e3882bfdc..ea999cf9c7 100644 XML_REF3_FILES = cpu_sup.xml \ disksup.xml \ memsup.xml \ + os_mon_mib.xml \ os_sup.xml \ - nteventlog.xml + $(NTEVENTLOG_DOCFILE) @@ -28,25 +29,25 @@ index 8e3882bfdc..ea999cf9c7 100644 XML_REF6_FILES = os_mon_app.xml diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index e28fb12548..ee32f3946f 100644 +index fc2eb22393..e2f4d5a090 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile -@@ -34,7 +34,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN) +@@ -34,8 +34,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN) # ---------------------------------------------------- # Target Specs # ---------------------------------------------------- --MODULES= disksup memsup cpu_sup os_mon os_mon_mib os_sup os_mon_sysinfo nteventlog +ifeq ($(findstring win32,$(TARGET)),win32) +NTEVENTLOG=nteventlog +else +NTEVENTLOG= +endif -+MODULES= disksup memsup cpu_sup os_mon os_mon_mib os_sup os_mon_sysinfo \ + MODULES= disksup memsup cpu_sup os_mon os_mon_mib os_sup os_mon_sysinfo \ +- nteventlog + $(NTEVENTLOG) INCLUDE=../include CSRC=../c_src -@@ -78,7 +84,11 @@ docs: +@@ -79,7 +84,11 @@ docs: # ---------------------------------------------------- $(APP_TARGET): $(APP_SRC) ../vsn.mk diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch new file mode 100644 index 0000000..1bd9697 --- /dev/null +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -0,0 +1,937 @@ +From: Hans Ulrich Niedermann +Date: Mon, 21 Mar 2011 15:41:49 +0100 +Subject: [PATCH] Do not install erlang sources + +Don't install *.erl, *.xrl, *.yrl, and *.asn1 files at all. + +Signed-off-by: Peter Lemenkov +Signed-off-by: Hans Ulrich Niedermann + +diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile +index edb9f35258..6ee4ac2251 100644 +--- a/erts/preloaded/src/Makefile ++++ b/erts/preloaded/src/Makefile +@@ -90,8 +90,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: $(APP_TARGET) +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(BEAM_FILES) $(STUBS_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" + +diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile +index ba459f6cd3..5565126214 100644 +--- a/lib/asn1/src/Makefile ++++ b/lib/asn1/src/Makefile +@@ -154,7 +154,7 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(APP_SRC) $(APPUP_SRC) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/examples" + $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" + +diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile +index 9d751996ad..b96a11225c 100644 +--- a/lib/common_test/src/Makefile ++++ b/lib/common_test/src/Makefile +@@ -152,7 +152,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/include" +diff --git a/lib/common_test/test_server/Makefile b/lib/common_test/test_server/Makefile +index f015064b39..57f96d2929 100644 +--- a/lib/common_test/test_server/Makefile ++++ b/lib/common_test/test_server/Makefile +@@ -86,9 +86,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_tests_spec: opt + $(INSTALL_DIR) "$(RELEASE_PATH)/test_server" +- $(INSTALL_DATA) $(TS_ERL_FILES) $(TS_HRL_FILES) \ ++ $(INSTALL_DATA) $(TS_HRL_FILES) \ + $(TS_TARGET_FILES) \ +- $(AUTOCONF_FILES) $(CONFIG) \ ++ $(CONFIG) \ + "$(RELEASE_PATH)/test_server" + $(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server" + +diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile +index ef6db66ff6..4c9be713aa 100644 +--- a/lib/compiler/src/Makefile ++++ b/lib/compiler/src/Makefile +@@ -174,8 +174,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \ +- $(YRL_FILE) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) $(EXTRA_FILES) \ ++ "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile +index 29d6223005..cb433090d2 100644 +--- a/lib/cosEvent/src/Makefile ++++ b/lib/cosEvent/src/Makefile +@@ -203,7 +203,7 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" + +diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile +index cdaf9e5f1f..6e4e9b8c52 100644 +--- a/lib/cosEventDomain/src/Makefile ++++ b/lib/cosEventDomain/src/Makefile +@@ -172,7 +172,7 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include" + +diff --git a/lib/cosFileTransfer/src/Makefile b/lib/cosFileTransfer/src/Makefile +index b3967101e9..2678c2a642 100644 +--- a/lib/cosFileTransfer/src/Makefile ++++ b/lib/cosFileTransfer/src/Makefile +@@ -180,9 +180,7 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) $(GEN_HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" +- $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" + + release_docs_spec: +diff --git a/lib/cosNotification/src/Makefile b/lib/cosNotification/src/Makefile +index 009c6be4a5..83c2e26057 100644 +--- a/lib/cosNotification/src/Makefile ++++ b/lib/cosNotification/src/Makefile +@@ -371,8 +371,7 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(YECC_FILES) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILES) $(YECC_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" + +diff --git a/lib/cosProperty/src/Makefile b/lib/cosProperty/src/Makefile +index 1fdc258a6d..90cf7116b7 100644 +--- a/lib/cosProperty/src/Makefile ++++ b/lib/cosProperty/src/Makefile +@@ -180,8 +180,7 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" + +diff --git a/lib/cosTime/src/Makefile b/lib/cosTime/src/Makefile +index 55d59baea3..f22e2c81db 100644 +--- a/lib/cosTime/src/Makefile ++++ b/lib/cosTime/src/Makefile +@@ -199,8 +199,7 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" + +diff --git a/lib/cosTransactions/src/Makefile b/lib/cosTransactions/src/Makefile +index 4cc1e487c2..084f0a7230 100644 +--- a/lib/cosTransactions/src/Makefile ++++ b/lib/cosTransactions/src/Makefile +@@ -174,7 +174,7 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILE) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include" + +diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile +index edad0e6b61..00a30c010f 100644 +--- a/lib/crypto/src/Makefile ++++ b/lib/crypto/src/Makefile +@@ -81,8 +81,6 @@ docs: + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \ + $(APPUP_TARGET) "$(RELSYSDIR)/ebin" +diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile +index 118cb6b758..86722d8767 100644 +--- a/lib/debugger/src/Makefile ++++ b/lib/debugger/src/Makefile +@@ -117,7 +117,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile +index fc08e7ca2f..2464a15c3f 100644 +--- a/lib/dialyzer/src/Makefile ++++ b/lib/dialyzer/src/Makefile +@@ -158,7 +158,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \ ++ $(INSTALL_DATA) $(HRL_FILES) $(EXTRA_FILES) \ + "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" +diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile +index 3af856f63e..9630a89ba6 100644 +--- a/lib/diameter/src/Makefile ++++ b/lib/diameter/src/Makefile +@@ -251,11 +251,8 @@ release_spec: opt + $(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%) + + $(TARGET_DIRS:%/=release_src_%): release_src_%: +- $(INSTALL_DIR) "$(RELSYSDIR)/src/$*" +- $(INSTALL_DATA) $(filter $*/%, $(TARGET_MODULES:%=%.erl) \ +- $(INTERNAL_HRLS)) \ +- $(filter $*/%, compiler/$(DICT_YRL).yrl) \ +- "$(RELSYSDIR)/src/$*" ++ $(INSTALL_DATA) $(filter $*/%, $(INTERNAL_HRLS)) \ ++ "$(RELSYSDIR)/src/$*" || true + + $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%: + $(INSTALL_DIR) "$(RELSYSDIR)/examples/$*" +diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile +index ea2f45dc4c..84af08eb67 100644 +--- a/lib/edoc/src/Makefile ++++ b/lib/edoc/src/Makefile +@@ -87,7 +87,7 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(SOURCES) $(HRL_FILES) $(YRL_FILE) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" + + release_docs_spec: + +diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile +index b79a537424..d0b231e5fc 100644 +--- a/lib/eldap/src/Makefile ++++ b/lib/eldap/src/Makefile +@@ -98,13 +98,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" +- $(INSTALL_DATA) $(ASN1_HRL) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" +- $(INSTALL_DIR) "$(RELSYSDIR)/asn1" +- $(INSTALL_DATA) ../asn1/$(ASN1_FILES) "$(RELSYSDIR)/asn1" ++ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/include" +- $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" + + release_docs_spec: + +diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile +index 82d051e9bb..950fdbe177 100644 +--- a/lib/erl_docgen/src/Makefile ++++ b/lib/erl_docgen/src/Makefile +@@ -90,8 +90,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile +index b6347d8b6d..a695d2cc2d 100644 +--- a/lib/et/src/Makefile ++++ b/lib/et/src/Makefile +@@ -109,7 +109,6 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" +diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile +index 3510d3cc93..9179e9b4c2 100644 +--- a/lib/eunit/src/Makefile ++++ b/lib/eunit/src/Makefile +@@ -120,7 +120,6 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(PARSE_TRANSFORM) $(SOURCES) "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" +diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile +index 9f50d6bf91..df92b84c0d 100644 +--- a/lib/hipe/cerl/Makefile ++++ b/lib/hipe/cerl/Makefile +@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/cerl" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/cerl" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/cerl" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/hipe/flow/Makefile b/lib/hipe/flow/Makefile +index d883eecf36..3119bc4638 100644 +--- a/lib/hipe/flow/Makefile ++++ b/lib/hipe/flow/Makefile +@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/flow" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(INC_FILES) "$(RELSYSDIR)/flow" ++ $(INSTALL_DATA) $(HRL_FILES) $(INC_FILES) "$(RELSYSDIR)/flow" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/hipe/icode/Makefile b/lib/hipe/icode/Makefile +index b220bc16a0..d4073277be 100644 +--- a/lib/hipe/icode/Makefile ++++ b/lib/hipe/icode/Makefile +@@ -120,7 +120,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/icode" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/icode" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/icode" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/hipe/llvm/Makefile b/lib/hipe/llvm/Makefile +index 817ff67dcd..e50ba5e207 100644 +--- a/lib/hipe/llvm/Makefile ++++ b/lib/hipe/llvm/Makefile +@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/llvm +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/llvm ++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/llvm + $(INSTALL_DIR) $(RELSYSDIR)/ebin + $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + +diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile +index 8ef31dbb46..80d28819f2 100644 +--- a/lib/hipe/main/Makefile ++++ b/lib/hipe/main/Makefile +@@ -118,7 +118,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DATA) ../vsn.mk "$(RELSYSDIR)" + $(INSTALL_DIR) "$(RELSYSDIR)/main" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/main" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/main" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/hipe/misc/Makefile b/lib/hipe/misc/Makefile +index e5033e444b..74a444b386 100644 +--- a/lib/hipe/misc/Makefile ++++ b/lib/hipe/misc/Makefile +@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/misc" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/misc" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/misc" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile +index 5abc9ec049..664df3b0c6 100644 +--- a/lib/hipe/rtl/Makefile ++++ b/lib/hipe/rtl/Makefile +@@ -105,7 +105,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/rtl" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/rtl" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/rtl" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/hipe/util/Makefile b/lib/hipe/util/Makefile +index 20b1c3bf50..40c642a441 100644 +--- a/lib/hipe/util/Makefile ++++ b/lib/hipe/util/Makefile +@@ -50,7 +50,6 @@ HIPE_MODULES = + endif + MODULES = hipe_timing hipe_dot hipe_digraph hipe_dsets $(HIPE_MODULES) + +-HRL_FILES= + ERL_FILES= $(MODULES:%=%.erl) + TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) + DOC_FILES= $(MODULES:%=$(DOCS)/%.html) +@@ -104,8 +103,6 @@ $(DOCS)/%.html:%.erl + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt +- $(INSTALL_DIR) "$(RELSYSDIR)/util" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/util" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/ic/src/Makefile b/lib/ic/src/Makefile +index 6ad2fbeeb7..258517da6f 100644 +--- a/lib/ic/src/Makefile ++++ b/lib/ic/src/Makefile +@@ -200,7 +200,7 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/examples" + $(INSTALL_DIR) "$(RELSYSDIR)/examples/c-client" + $(INSTALL_DATA) $(CCL_EX_FILES) "$(RELSYSDIR)/examples/c-client" +diff --git a/lib/inets/src/ftp/Makefile b/lib/inets/src/ftp/Makefile +index 6b99694ea7..530a19ecea 100644 +--- a/lib/inets/src/ftp/Makefile ++++ b/lib/inets/src/ftp/Makefile +@@ -91,7 +91,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/ftp" +- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/ftp" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/ftp" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile +index a1c1f36b70..f2eb86f7ac 100644 +--- a/lib/inets/src/http_client/Makefile ++++ b/lib/inets/src/http_client/Makefile +@@ -92,7 +92,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/http_client" +- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_client" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_client" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile +index 8248e37c44..1f1b23184b 100644 +--- a/lib/inets/src/http_lib/Makefile ++++ b/lib/inets/src/http_lib/Makefile +@@ -90,7 +90,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/http_lib" +- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_lib" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_lib" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile +index 1c05d454a5..88f9f62d3b 100644 +--- a/lib/inets/src/http_server/Makefile ++++ b/lib/inets/src/http_server/Makefile +@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/http_server" +- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_server" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_server" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile +index eb0098dbee..fff21ff740 100644 +--- a/lib/inets/src/inets_app/Makefile ++++ b/lib/inets/src/inets_app/Makefile +@@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/inets_app" +- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/inets_app" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/inets_app" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" +diff --git a/lib/inets/src/tftp/Makefile b/lib/inets/src/tftp/Makefile +index 4eaa959cce..198fbf3106 100644 +--- a/lib/inets/src/tftp/Makefile ++++ b/lib/inets/src/tftp/Makefile +@@ -96,7 +96,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/tftp" +- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/tftp" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/tftp" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile +index 5946620f0f..b8944e0a26 100644 +--- a/lib/kernel/src/Makefile ++++ b/lib/kernel/src/Makefile +@@ -204,7 +204,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" +diff --git a/lib/megaco/src/app/Makefile b/lib/megaco/src/app/Makefile +index ab45548099..5c7a7f0be9 100644 +--- a/lib/megaco/src/app/Makefile ++++ b/lib/megaco/src/app/Makefile +@@ -114,7 +114,7 @@ release_spec: opt + $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/app" +- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/app" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/app" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" + +diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile +index b9643669f6..5b5a4cf482 100644 +--- a/lib/megaco/src/binary/Makefile ++++ b/lib/megaco/src/binary/Makefile +@@ -176,7 +176,7 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/binary" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(ASN1_FILES) "$(RELSYSDIR)/src/binary" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/binary" + + + release_docs_spec: +diff --git a/lib/megaco/src/engine/Makefile b/lib/megaco/src/engine/Makefile +index 869b516b05..fa7d774d84 100644 +--- a/lib/megaco/src/engine/Makefile ++++ b/lib/megaco/src/engine/Makefile +@@ -102,7 +102,7 @@ release_spec: opt + $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/engine" +- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/engine" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/engine" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + + +diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in +index 09bf1efe95..b320b2e96f 100644 +--- a/lib/megaco/src/flex/Makefile.in ++++ b/lib/megaco/src/flex/Makefile.in +@@ -268,7 +268,6 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src/flex" + $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" + $(INSTALL_DIR) "$(RELSYSDIR)/include" +- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) + $(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex" +diff --git a/lib/megaco/src/tcp/Makefile b/lib/megaco/src/tcp/Makefile +index d07db3fa4b..7f421d24cc 100644 +--- a/lib/megaco/src/tcp/Makefile ++++ b/lib/megaco/src/tcp/Makefile +@@ -94,7 +94,7 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/tcp" +- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/tcp" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/tcp" + + + release_docs_spec: +diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile +index 8e7e82b276..2a118d24e3 100644 +--- a/lib/megaco/src/text/Makefile ++++ b/lib/megaco/src/text/Makefile +@@ -135,7 +135,7 @@ release_spec: opt + $(INSTALL_DATA) $(BEAM_TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/text" +- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_YRL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/text" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/text" + + + release_docs_spec: +diff --git a/lib/megaco/src/udp/Makefile b/lib/megaco/src/udp/Makefile +index 028a63e98e..9e11e9bfb2 100644 +--- a/lib/megaco/src/udp/Makefile ++++ b/lib/megaco/src/udp/Makefile +@@ -94,7 +94,7 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/udp" +- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/udp" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/udp" + + + release_docs_spec: +diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile +index 7d316df263..60fdefb5d0 100644 +--- a/lib/mnesia/src/Makefile ++++ b/lib/mnesia/src/Makefile +@@ -134,7 +134,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile +index ff2bcbdb99..4973158705 100644 +--- a/lib/observer/src/Makefile ++++ b/lib/observer/src/Makefile +@@ -149,7 +149,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/examples" + $(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples" +diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile +index 7ca59495ed..a52ade2fe3 100644 +--- a/lib/odbc/src/Makefile ++++ b/lib/odbc/src/Makefile +@@ -110,7 +110,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" +diff --git a/lib/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile +index 108663396c..553c9cdd01 100644 +--- a/lib/orber/COSS/CosNaming/Makefile ++++ b/lib/orber/COSS/CosNaming/Makefile +@@ -145,8 +145,8 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/COSS/CosNaming" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming" +- $(INSTALL_DATA) $(GEN_FILES) "$(RELSYSDIR)/COSS/CosNaming" ++ $(INSTALL_DATA) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming" ++ $(INSTALL_DATA) $(GEN_HRL_FILES) $(GEN_EXT_HRL_FILES) "$(RELSYSDIR)/COSS/CosNaming" + + + release_docs_spec: +diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile +index 7fec29a000..a71b9f1227 100644 +--- a/lib/orber/src/Makefile ++++ b/lib/orber/src/Makefile +@@ -253,7 +253,7 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) "$(RELSYSDIR)/include" + +diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile +index e2f4d5a090..57f21a145b 100644 +--- a/lib/os_mon/src/Makefile ++++ b/lib/os_mon/src/Makefile +@@ -105,7 +105,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" +diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile +index 5c7af39c3f..a85368b4f4 100644 +--- a/lib/otp_mibs/src/Makefile ++++ b/lib/otp_mibs/src/Makefile +@@ -96,8 +96,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGETS) "$(RELSYSDIR)/ebin" + +diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile +index ba206904ec..281cc8657c 100644 +--- a/lib/parsetools/src/Makefile ++++ b/lib/parsetools/src/Makefile +@@ -91,8 +91,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/include" +diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile +index a920ea87ea..7672ef3470 100644 +--- a/lib/public_key/asn1/Makefile ++++ b/lib/public_key/asn1/Makefile +@@ -96,8 +96,8 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/asn1" +- $(INSTALL_DATA) $(ASN_ASNS) $(ASN_ERLS) $(ASN_HRLS) $(ASN_CONFIGS) \ +- $(GEN_ERLS) "$(RELSYSDIR)/asn1" ++ $(INSTALL_DATA) $(ASN_ASNS) $(ASN_HRLS) $(ASN_CONFIGS) \ ++ "$(RELSYSDIR)/asn1" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile +index e61390bce3..6ed6c2cf9f 100644 +--- a/lib/public_key/src/Makefile ++++ b/lib/public_key/src/Makefile +@@ -109,8 +109,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" +diff --git a/lib/reltool/src/Makefile b/lib/reltool/src/Makefile +index 4bddee4664..c714255548 100644 +--- a/lib/reltool/src/Makefile ++++ b/lib/reltool/src/Makefile +@@ -100,7 +100,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" +diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile +index 5a99c6e240..bdd77fb4f4 100644 +--- a/lib/runtime_tools/src/Makefile ++++ b/lib/runtime_tools/src/Makefile +@@ -98,8 +98,6 @@ docs: + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/examples" +diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile +index ac7ee51100..c53f661675 100644 +--- a/lib/sasl/src/Makefile ++++ b/lib/sasl/src/Makefile +@@ -93,7 +93,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" +diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile +index 2943a4d550..8203e62361 100644 +--- a/lib/snmp/src/agent/Makefile ++++ b/lib/snmp/src/agent/Makefile +@@ -131,7 +131,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/agent" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/agent" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/agent" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ + "$(RELSYSDIR)/ebin" +diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile +index 6f2b8a4077..bd062a6473 100644 +--- a/lib/snmp/src/app/Makefile ++++ b/lib/snmp/src/app/Makefile +@@ -132,7 +132,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/app" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/app" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/app" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ + "$(RELSYSDIR)/ebin" +diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile +index 4093ffa9ca..18878aa5db 100644 +--- a/lib/snmp/src/compile/Makefile ++++ b/lib/snmp/src/compile/Makefile +@@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/compiler" +- $(INSTALL_DATA) $(ESCRIPT_SRC) $(PARSER_SRC) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/compiler" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/compiler" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/bin" +diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile +index 0cc87492f1..d203f2846a 100644 +--- a/lib/snmp/src/manager/Makefile ++++ b/lib/snmp/src/manager/Makefile +@@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/manager" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/manager" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/manager" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + # $(INSTALL_DIR) "$(RELSYSDIR)/include" +diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile +index adc2c4858f..89ce954e99 100644 +--- a/lib/snmp/src/misc/Makefile ++++ b/lib/snmp/src/misc/Makefile +@@ -112,7 +112,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/misc" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/misc" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/misc" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + # $(INSTALL_DIR) "$(RELSYSDIR)/include" +diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile +index 9e8d80c71f..6ce3dc96ef 100644 +--- a/lib/ssh/src/Makefile ++++ b/lib/ssh/src/Makefile +@@ -137,7 +137,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ + $(APPUP_TARGET) "$(RELSYSDIR)/ebin" +diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile +index 2e7df9792e..0cd43d3805 100644 +--- a/lib/ssl/src/Makefile ++++ b/lib/ssl/src/Makefile +@@ -151,7 +151,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ + $(APPUP_TARGET) "$(RELSYSDIR)/ebin" +diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile +index bf836203ec..e86fb6a6d1 100644 +--- a/lib/stdlib/src/Makefile ++++ b/lib/stdlib/src/Makefile +@@ -212,7 +212,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) erl_parse.yrl "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" +diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile +index 8325db45a8..d17fdaa0ec 100644 +--- a/lib/syntax_tools/src/Makefile ++++ b/lib/syntax_tools/src/Makefile +@@ -100,8 +100,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin" +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(SOURCES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" + +diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile +index 032bd612db..efb0309eb8 100644 +--- a/lib/tools/src/Makefile ++++ b/lib/tools/src/Makefile +@@ -106,7 +106,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ + "$(RELSYSDIR)/ebin" +diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile +index 21b45af2c4..a7bf34f4f4 100644 +--- a/lib/wx/src/Makefile ++++ b/lib/wx/src/Makefile +@@ -122,9 +122,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) + include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/gen" +- $(INSTALL_DATA) $(GEN_HRL) $(GEN_FILES) "$(RELSYSDIR)/src/gen" ++ $(INSTALL_DATA) $(GEN_HRL) "$(RELSYSDIR)/src/gen" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" +diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile +index 51d9190797..1ab65bd2ed 100644 +--- a/lib/xmerl/src/Makefile ++++ b/lib/xmerl/src/Makefile +@@ -218,9 +218,7 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(APP_SRC) $(APPUP_SRC) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) xmerl_xpath_parse.yrl "$(RELSYSDIR)/src" +- $(INSTALL_DATA) xmerl_b64Bin.yrl "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" + diff --git a/otp-0007-Fix-erl_epmd-port_please-when-using-IPv6.patch b/otp-0007-Fix-erl_epmd-port_please-when-using-IPv6.patch new file mode 100644 index 0000000..866d325 --- /dev/null +++ b/otp-0007-Fix-erl_epmd-port_please-when-using-IPv6.patch @@ -0,0 +1,26 @@ +From: John Eckersberg +Date: Wed, 14 Jun 2017 12:32:17 -0400 +Subject: [PATCH] Fix erl_epmd:port_please when using IPv6 + +This mirrors the behavior of inet:gethostbyname when no family or +timeout is supplied. + +diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl +index 7bc9e2ede3..f96bc88913 100644 +--- a/lib/kernel/src/erl_epmd.erl ++++ b/lib/kernel/src/erl_epmd.erl +@@ -79,7 +79,13 @@ port_please(Node, EpmdAddr, Timeout) -> + + + port_please1(Node,HostName, Timeout) -> +- case inet:gethostbyname(HostName, inet, Timeout) of ++ Family = case inet_db:res_option(inet6) of ++ true -> ++ inet6; ++ false -> ++ inet ++ end, ++ case inet:gethostbyname(HostName, Family, Timeout) of + {ok,{hostent, _Name, _ , _Af, _Size, [EpmdAddr | _]}} -> + get_port(Node, EpmdAddr, Timeout); + Else -> diff --git a/otp-0006-Add-extra-search-directory.patch b/otp-0008-Add-extra-search-directory.patch similarity index 90% rename from otp-0006-Add-extra-search-directory.patch rename to otp-0008-Add-extra-search-directory.patch index 2f872ef..806418b 100644 --- a/otp-0006-Add-extra-search-directory.patch +++ b/otp-0008-Add-extra-search-directory.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add extra search directory Signed-off-by: Peter Lemenkov diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl -index 7327636751..2e92e77598 100644 +index f5a890cb95..f2bb1a1290 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl -@@ -90,11 +90,17 @@ init(Ref, Parent, [Root,Mode]) -> +@@ -79,11 +79,17 @@ init(Ref, Parent, [Root,Mode]) -> IPath = case Mode of interactive -> diff --git a/otp-0009-Add-GDB-tools.patch b/otp-0009-Add-GDB-tools.patch deleted file mode 100644 index 462324e..0000000 --- a/otp-0009-Add-GDB-tools.patch +++ /dev/null @@ -1,464 +0,0 @@ -From: Peter Lemenkov -Date: Thu, 19 Jun 2025 13:17:52 +0200 -Subject: [PATCH] Add GDB tools - -* https://github.com/erlang/otp-gdb-tools -* Commit 7b864f58c534699e4124e31ecfda86041b941037. - -Signed-off-by: Peter Lemenkov - -diff --git a/erts/etc/unix/gdb-tools/README.md b/erts/etc/unix/gdb-tools/README.md -new file mode 100644 -index 0000000000..8a6cf92b1d ---- /dev/null -+++ b/erts/etc/unix/gdb-tools/README.md -@@ -0,0 +1,42 @@ -+# Erlang/OTP GDB Tools -+ -+This repository contains GDB tools that cannot -+be part of the main Erlang/OTP repository for licensing -+reasons. The tools are used when building and debugging -+Erlang/OTP with gdb and are installed as needed by the -+Erlang/OTP build system. -+ -+Right now the only tool in this repository is the jit-reader -+which is a plugin to gdb that allows it to read the stack of -+Erlang processes when using the JIT. This allows commands -+such as `backtrace` to show Erlang stackframes. For example: -+ -+``` -+(gdb) bt -+#0 0x00007fffa40005ee in global::call_bif_shared () -+#1 0x00007fffa411eaac in erl_eval:eval_lc1/7 () at erl_eval.erl:929 -+#2 0x00007fffa411e7bc in erl_eval:eval_lc/7 () at erl_eval.erl:917 -+#3 0x00007fffa4296528 in lists:map_1/2 () at lists.erl:2082 -+#4 0x00007fffa4296554 in lists:map_1/2 () at lists.erl:2082 -+#5 0x00007fffa4296554 in lists:map_1/2 () at lists.erl:2082 -+#6 0x00007fffa4296554 in lists:map_1/2 () at lists.erl:2082 -+..... -+#98 0x00007fffa4296554 in lists:map_1/2 () at lists.erl:2082 -+#99 0x00007fffa4296554 in lists:map_1/2 () at lists.erl:2082 -+#100 0x00007fffa4296554 in lists:map_1/2 () at lists.erl:2082 -+#101 0x00007fffa42963d4 in lists:map/2 () at lists.erl:2077 -+#102 0x00007fffa411e45c in erl_eval:do_apply/7 () at erl_eval.erl:904 -+#103 0x00007fffa45f4c58 in shell:exprs/7 () at shell.erl:893 -+#104 0x00007fffa45f42c4 in shell:eval_exprs/7 () at shell.erl:849 -+#105 0x00007fffa45f3dac in shell:eval_loop/4 () at shell.erl:834 -+#106 0x00007fffa40024b8 in erts_beamasm:normal_exit/0-CodeInfoPrologue () -+Backtrace stopped: previous frame inner to this frame (corrupt stack?) -+(gdb) -+``` -+ -+## Updates of jit-reader -+ -+When updating jit-reader you first need to update this repository -+and push the new version here. Then you need to run -+`./otp_build update_gdb_tools` in the Erlang/OTP repo for -+it to use the correct commit. -diff --git a/erts/etc/unix/gdb-tools/jit-reader.c b/erts/etc/unix/gdb-tools/jit-reader.c -new file mode 100644 -index 0000000000..3c39c5540d ---- /dev/null -+++ b/erts/etc/unix/gdb-tools/jit-reader.c -@@ -0,0 +1,386 @@ -+#include -+ -+#include -+#include -+#include -+#include -+ -+/* Useful links -+ * - https://pwparchive.wordpress.com/2011/11/20/new-jit-interface-for-gdb/ -+ * - https://sourceware.org/gdb/current/onlinedocs/gdb/Custom-Debug-Info.html -+ * - https://github.com/tetzank/asmjit-utilities -+ * - https://github.com/bminor/binutils-gdb/blob/master/gdb/testsuite/gdb.base/jitreader.c -+ */ -+ -+GDB_DECLARE_GPL_COMPATIBLE_READER -+ -+#if 0 -+#define HARD_DEBUG -+static FILE *log = NULL; -+#define LOG(...) do { fprintf(log, ##__VA_ARGS__); fflush(log); } while(0) -+#else -+#define LOG(...) -+#endif -+ -+typedef enum { -+ X64_RBP = 6, /* Frame pointer iff native frames are enabled */ -+ X64_RSP = 7, /* Stack pointer when using native stack */ -+ X64_R12 = 12, /* Stack pointer when using non-native stack */ -+ X64_R13 = 13, /* Current process */ -+ X64_RIP = 16 -+} X64Register; -+ -+typedef enum { -+ /* Return address only */ -+ ERTS_FRAME_LAYOUT_RA, -+ /* Frame pointer, return address */ -+ ERTS_FRAME_LAYOUT_FP_RA -+} ErtsFrameLayout; -+ -+struct emulator_info { -+ /* 0 = regular, 1 = frame pointers */ -+ int frame_layout; -+ const void *normal_exit; -+}; -+ -+struct erlang_module_info { -+ uint64_t base_address; -+ uint32_t range_count; -+ uint32_t code_size; -+ /* Module name, including null terminator. */ -+ uint16_t name_length; -+ char name[]; -+ /* array of range_info structures */ -+}; -+ -+struct range_info { -+ uint32_t start_offset; -+ uint32_t end_offset; -+ uint32_t line_count; -+ /* Range name, including null terminator. */ -+ uint16_t name_length; -+ char name[]; -+ /* array of line_info structures */ -+}; -+ -+struct line_info { -+ uint32_t start_offset; -+ uint32_t line_number; -+ /* File name, including null terminator. */ -+ uint16_t file_length; -+ char file[]; -+}; -+ -+enum debug_info_header { -+ DEBUG_INFO_HEADER_EMULATOR = 0, -+ DEBUG_INFO_HEADER_MODULE = 1, -+}; -+ -+struct debug_info { -+ enum debug_info_header header; -+ union { -+ struct emulator_info emu; -+ struct erlang_module_info mod; -+ } payload; -+}; -+ -+typedef struct range { -+ GDB_CORE_ADDR start; -+ GDB_CORE_ADDR end; -+#ifdef HARD_DEBUG -+ char *name; -+#endif -+} range; -+ -+typedef struct priv { -+ range *ranges; -+ int num_ranges; -+ ErtsFrameLayout frame_layout; -+ const void *normal_exit; -+} priv; -+ -+static enum gdb_status read_module_info(struct gdb_reader_funcs *self, -+ struct gdb_symbol_callbacks *cb, -+ struct erlang_module_info *module_info) { -+ struct gdb_object *obj = cb->object_open(cb); -+ GDB_CORE_ADDR mod_start, mod_end; -+ char *symfile = (char*)module_info; -+ priv *priv = self->priv_data; -+ -+ symfile += sizeof(*module_info) + module_info->name_length; -+ -+ mod_start = module_info->base_address; -+ mod_end = mod_start + module_info->code_size; -+ -+ priv->ranges = realloc(priv->ranges, (priv->num_ranges + 1) * sizeof(range)); -+ priv->ranges[priv->num_ranges].start = mod_start; -+ priv->ranges[priv->num_ranges].end = mod_end; -+#ifdef HARD_DEBUG -+ priv->ranges[priv->num_ranges].name = strdup(module_info->name); -+#endif -+ priv->num_ranges += 1; -+ -+ LOG("Add module `%s` (0x%lx, 0x%lx)\r\n", -+ module_info->name, mod_start, mod_end); -+ -+ for (int range = 0; range < module_info->range_count; range++) { -+ struct range_info *range_info; -+ struct gdb_symtab *symtab; -+ GDB_CORE_ADDR begin, end; -+ -+ range_info = (struct range_info *)symfile; -+ symfile += sizeof(*range_info) + range_info->name_length; -+ -+ begin = mod_start + range_info->start_offset; -+ end = mod_start + range_info->end_offset; -+ -+ LOG("Add range `%s` (0x%lx, 0x%lx), %u lines\r\n", -+ range_info->name, -+ begin, end, -+ range_info->line_count); -+ -+ /* A bug in GDB < 9 forces us to open and close the symtab for each -+ * iteration. */ -+ symtab = cb->symtab_open(cb, obj, module_info->name); -+ cb->block_open(cb, symtab, NULL, begin, end, range_info->name); -+ cb->symtab_close(cb, symtab); -+ -+ for (int line = 0; line < range_info->line_count; line++) { -+ struct gdb_line_mapping line_mapping; -+ struct line_info *line_info; -+ -+ line_info = (struct line_info *)symfile; -+ symfile += sizeof(*line_info) + line_info->file_length; -+ -+ line_mapping.pc = mod_start + line_info->start_offset; -+ line_mapping.line = line_info->line_number; -+ -+ LOG("\t%s:%u\r\n", line_info->file, line_info->line_number); -+ -+ /* The symbol table must be opened and closed on every single line -+ * for file names to work properly, as there is no other way to -+ * tell GDB that a certain line belongs to a different file than -+ * the rest of the table. Sigh. */ -+ symtab = cb->symtab_open(cb, obj, line_info->file); -+ -+ cb->block_open(cb, symtab, NULL, line_mapping.pc, end, -+ range_info->name); -+ cb->line_mapping_add(cb, symtab, 1, &line_mapping); -+ cb->symtab_close(cb, symtab); -+ } -+ } -+ -+ cb->object_close(cb, obj); -+ -+ return GDB_SUCCESS; -+} -+ -+static enum gdb_status read_emulator_info(struct gdb_reader_funcs *self, -+ struct gdb_symbol_callbacks *cb, -+ struct emulator_info *emulator_info) { -+ priv *priv = self->priv_data; -+ -+ priv->frame_layout = emulator_info->frame_layout; -+ priv->normal_exit = emulator_info->normal_exit; -+ -+ LOG("initialize: frame layout = %i\r\n", priv->frame_layout); -+ -+ return GDB_SUCCESS; -+} -+ -+static enum gdb_status read_debug_info(struct gdb_reader_funcs *self, -+ struct gdb_symbol_callbacks *cb, -+ void *memory, long memory_sz) { -+ struct debug_info *debug_info = memory; -+ -+ (void)memory_sz; -+ -+ switch (debug_info->header) { -+ case DEBUG_INFO_HEADER_EMULATOR: -+ return read_emulator_info(self, cb, &debug_info->payload.emu); -+ case DEBUG_INFO_HEADER_MODULE: -+ return read_module_info(self, cb, &debug_info->payload.mod); -+ } -+ -+ return GDB_FAIL; -+} -+ -+static void regfree(struct gdb_reg_value *reg) { -+ free(reg); -+} -+ -+static struct range *get_range(priv *priv, GDB_CORE_ADDR rip) { -+ for (int i = 0; i < priv->num_ranges; i++) { -+ if (rip >= priv->ranges[i].start && rip < priv->ranges[i].end) { -+ return &priv->ranges[i]; -+ } -+ } -+ -+ return NULL; -+} -+ -+static enum gdb_status unwind(struct gdb_reader_funcs *self, -+ struct gdb_unwind_callbacks *cb) { -+ GDB_CORE_ADDR rbp, rsp, rip; -+ struct range *range; -+ priv *priv; -+ -+ rbp = *(GDB_CORE_ADDR*)cb->reg_get(cb, X64_RBP)->value; -+ rsp = *(GDB_CORE_ADDR*)cb->reg_get(cb, X64_RSP)->value; -+ rip = *(GDB_CORE_ADDR*)cb->reg_get(cb, X64_RIP)->value; -+ -+ priv = self->priv_data; -+ range = get_range(priv, rip); -+ -+ /* Check that rip points to one of the addresses that we handle */ -+ if (range) { -+ struct gdb_reg_value *prev_rbp, *prev_rsp, *prev_rip; -+ -+ prev_rbp = malloc(sizeof(struct gdb_reg_value) + sizeof(char*)); -+ prev_rsp = malloc(sizeof(struct gdb_reg_value) + sizeof(char*)); -+ prev_rip = malloc(sizeof(struct gdb_reg_value) + sizeof(char*)); -+ -+ LOG("UNWIND match %s: rbp: 0x%lx rsp: 0x%lx rip: 0x%lx \r\n", -+ range->name, rbp, rsp, rip); -+ -+ prev_rbp->free = ®free; -+ prev_rbp->defined = 1; -+ prev_rbp->size = sizeof(char*); -+ prev_rsp->free = ®free; -+ prev_rsp->defined = 1; -+ prev_rsp->size = sizeof(char*); -+ prev_rip->free = ®free; -+ prev_rip->defined = 1; -+ prev_rip->size = sizeof(char*); -+ -+ if (priv->frame_layout == ERTS_FRAME_LAYOUT_FP_RA) { -+ /* Frame pointers are enabled, which means that rbp will point to -+ * where we stored the previous frames rbp. Also the previous -+ * frames address will be at rbp + 8 and the previous frames rsp -+ * will be rbp + 16. -+ * -+ * 0x00: <- prev_rsp -+ * 0x08: prev call addr -+ * 0x10: prev rbp <- curr rbp -+ * 0x18: current frame -+ * 0x20: <- curr rip */ -+ cb->target_read(rbp + 1 * sizeof(char*), &prev_rip->value, -+ sizeof(char*)); -+ cb->target_read(rbp + 0 * sizeof(char*), &prev_rbp->value, -+ sizeof(char*)); -+ *(GDB_CORE_ADDR*)prev_rsp->value = rbp + sizeof(char*[2]); -+ } else { -+ /* Normal frame layout, we need to scan the stack. */ -+ cb->target_read(rsp, &prev_rip->value, sizeof(char*)); -+ -+ for (rsp += sizeof(char*); ; rsp += sizeof(char*)) { -+ cb->target_read(rsp, &prev_rip->value, sizeof(char*)); -+ -+ LOG("rsp: 0x%lx rip: 0x%lx\r\n", -+ rsp, *(GDB_CORE_ADDR*)prev_rip->value); -+ -+ /* Check if it is a cp */ -+ if ((*(GDB_CORE_ADDR*)prev_rip->value & 0x3) == 0) { -+ break; -+ } -+ } -+ -+ *(GDB_CORE_ADDR*)prev_rsp->value = rsp; -+ *(GDB_CORE_ADDR*)prev_rbp->value = rsp - sizeof(char*); -+ } -+ -+ if (*(GDB_CORE_ADDR*)prev_rip->value == (uintptr_t)priv->normal_exit) { -+ LOG("Normal exit\r\n"); -+ *(GDB_CORE_ADDR*)prev_rsp->value = 0; -+ *(GDB_CORE_ADDR*)prev_rbp->value = 0; -+ } else { -+ LOG("UNWIND prev: rbp: 0x%lx rsp: 0x%lx rip: 0x%lx\r\n", -+ *(GDB_CORE_ADDR*)prev_rbp->value, -+ *(GDB_CORE_ADDR*)prev_rsp->value, -+ *(GDB_CORE_ADDR*)prev_rip->value); -+ } -+ -+ cb->reg_set(cb, X64_RIP, prev_rip); -+ cb->reg_set(cb, X64_RSP, prev_rsp); -+ cb->reg_set(cb, X64_RBP, prev_rbp); -+ -+ return GDB_SUCCESS; -+ } -+ -+ LOG("UNWIND no match: rbp: 0x%lx rsp: 0x%lx rip: 0x%lx\r\n", rbp, rsp, rip); -+ return GDB_FAIL; -+} -+ -+static struct gdb_frame_id get_frame_id(struct gdb_reader_funcs *self, -+ struct gdb_unwind_callbacks *cb){ -+ struct gdb_frame_id frame = {0, 0}; -+ GDB_CORE_ADDR rbp, rsp, rip; -+ struct range *range; -+ priv *priv; -+ -+ rbp = *(GDB_CORE_ADDR*)cb->reg_get(cb, X64_RBP)->value; -+ rsp = *(GDB_CORE_ADDR*)cb->reg_get(cb, X64_RSP)->value; -+ rip = *(GDB_CORE_ADDR*)cb->reg_get(cb, X64_RIP)->value; -+ -+ priv = self->priv_data; -+ range = get_range(priv, rip); -+ -+ LOG("FRAME: rip: 0x%lx rsp: 0x%lx rbp: 0x%lx \r\n", rip, rsp, rbp); -+ -+ if (range) { -+ frame.code_address = rip; -+ -+ if (priv->frame_layout == ERTS_FRAME_LAYOUT_FP_RA) { -+ frame.stack_address = rbp + sizeof(char*); -+ } else { -+ GDB_CORE_ADDR prev_rip; -+ -+ for (rsp += sizeof(char*); ; rsp += sizeof(char*)) { -+ cb->target_read(rsp, &prev_rip, sizeof(char*)); -+ -+ LOG("rsp: 0x%lx rip: 0x%lx\r\n", rsp, prev_rip); -+ -+ /* Check if it is a cp */ -+ if ((prev_rip & 0x3) == 0) { -+ break; -+ } -+ } -+ -+ frame.stack_address = rsp; -+ } -+ } -+ -+ LOG("FRAME: code_address: 0x%lx stack_address: 0x%lx\r\n", -+ frame.code_address, frame.stack_address); -+ -+ return frame; -+} -+ -+static void destroy(struct gdb_reader_funcs *self){ -+ free(self); -+} -+ -+struct gdb_reader_funcs *gdb_init_reader(void){ -+ struct gdb_reader_funcs *funcs = malloc(sizeof(struct gdb_reader_funcs)); -+ priv *priv_data = malloc(sizeof(priv)); -+ -+ priv_data->num_ranges = 1; -+ priv_data->ranges = malloc(sizeof(range)); -+ priv_data->ranges[0].start = 0; -+ priv_data->ranges[0].end = 0; -+ -+ funcs->reader_version = GDB_READER_INTERFACE_VERSION; -+ funcs->priv_data = priv_data; -+ -+ funcs->read = read_debug_info; -+ funcs->unwind = unwind; -+ funcs->get_frame_id = get_frame_id; -+ funcs->destroy = destroy; -+ -+#ifdef HARD_DEBUG -+ log = fopen("/tmp/jit-reader.log","w+"); -+ if (!log) fprintf(stderr,"Could not open /tmp/jit-reader.log"); -+#endif -+ -+ return funcs; -+} -diff --git a/erts/etc/unix/gdb-tools/jit-reader.mk b/erts/etc/unix/gdb-tools/jit-reader.mk -new file mode 100644 -index 0000000000..8ef0bccec2 ---- /dev/null -+++ b/erts/etc/unix/gdb-tools/jit-reader.mk -@@ -0,0 +1,9 @@ -+EXTRA_LIBS = $(BINDIR)/jit-reader.so -+ -+jit-reader: $(EXTRA_LIBS) -+ -+$(OBJDIR)/jit-reader.o: $(GDB_TOOLS)/jit-reader.c $(GDB_TOOLS)/jit-reader.h -+ $(V_CC) $(DED_CFLAGS) -I$(ETC) -o $@ -c $< -+ -+$(BINDIR)/jit-reader.so: $(OBJDIR)/jit-reader.o -+ $(V_LD) $(DED_LDFLAGS) -o $@ $^ diff --git a/otp-0007-Avoid-forking-sed-to-get-basename.patch b/otp-0009-Avoid-forking-sed-to-get-basename.patch similarity index 83% rename from otp-0007-Avoid-forking-sed-to-get-basename.patch rename to otp-0009-Avoid-forking-sed-to-get-basename.patch index d146ab2..f98699a 100644 --- a/otp-0007-Avoid-forking-sed-to-get-basename.patch +++ b/otp-0009-Avoid-forking-sed-to-get-basename.patch @@ -4,14 +4,14 @@ Subject: [PATCH] Avoid forking sed to get basename. diff --git a/erts/etc/unix/erl.src.src b/erts/etc/unix/erl.src.src -index 536fa139d9..4dcffbc4c8 100644 +index 959c099e8f..861b8bcbf1 100644 --- a/erts/etc/unix/erl.src.src +++ b/erts/etc/unix/erl.src.src -@@ -49,7 +49,7 @@ else - fi - BINDIR="$ROOTDIR/erts-%VSN%/bin" +@@ -21,7 +21,7 @@ + ROOTDIR="%FINAL_ROOTDIR%" + BINDIR=$ROOTDIR/erts-%VSN%/bin EMU=%EMULATOR%%EMULATOR_NUMBER% --PROGNAME=`basename "$0"` +-PROGNAME=`echo $0 | sed 's/.*\///'` +PROGNAME=${0##*/} export EMU export ROOTDIR diff --git a/otp-0008-Load-man-pages-from-system-wide-directory.patch b/otp-0010-Load-man-pages-from-system-wide-directory.patch similarity index 89% rename from otp-0008-Load-man-pages-from-system-wide-directory.patch rename to otp-0010-Load-man-pages-from-system-wide-directory.patch index e014671..a5eab25 100644 --- a/otp-0008-Load-man-pages-from-system-wide-directory.patch +++ b/otp-0010-Load-man-pages-from-system-wide-directory.patch @@ -7,10 +7,10 @@ Patch allows one to use standard man path with erl -man command. as required by Debian policy.) diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c -index 888df87e35..14272f06c6 100644 +index 793cb532b3..2368a2c97b 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c -@@ -716,8 +716,10 @@ int main(int argc, char **argv) +@@ -712,8 +712,10 @@ int main(int argc, char **argv) error("-man not supported on Windows"); #else argv[i] = "man"; diff --git a/otp-0011-Improve-nodes-querying.patch b/otp-0011-Improve-nodes-querying.patch new file mode 100644 index 0000000..3fe0dea --- /dev/null +++ b/otp-0011-Improve-nodes-querying.patch @@ -0,0 +1,134 @@ +From: Peter Lemenkov +Date: Wed, 24 Oct 2018 14:58:41 +0200 +Subject: [PATCH] Improve nodes querying + +We've got a few similar stacktraces once. See the following one for +example: + +** Reason for termination == +** {badarg, + [{ets,next,[sys_dist,'rabbitmq-cli-42@host.example.com'],[]}, + {net_kernel,get_nodes,2,[{file,"net_kernel.erl"},{line,1025}]}, + {net_kernel,get_nodes,2,[{file,"net_kernel.erl"},{line,1019}]}, + {net_kernel,get_nodes_info,0,[{file,"net_kernel.erl"},{line,1439}]}, + {rabbit_mgmt_external_stats,cluster_links,0, + [{file,"src/rabbit_mgmt_external_stats.erl"},{line,252}]}, + {rabbit_mgmt_external_stats,emit_node_node_stats,1, + [{file,"src/rabbit_mgmt_external_stats.erl"},{line,366}]}, + {rabbit_mgmt_external_stats,handle_info,2, + [{file,"src/rabbit_mgmt_external_stats.erl"},{line,347}]}, + {gen_server,try_dispatch,4,[{file,"gen_server.erl"},{line,615}]}]} + +The problem is that when we're trying to query a list of connected +nodes, we're doing it in the following way: + + Call for the first record in ETS + While not EOF: + Call for the next record in ETS + +What happens, when some Node disconnects during the "not EOF" loop? +We'll get an exception. + +Let's do it differently - query a list of nodes in one shot, and then +get info from each of the nodes in list (w/o extra calls to ets). These +individual calls care of disconnected nodes so everything will be fine +even if a node disconnects. + +Signed-off-by: Peter Lemenkov + +diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl +index 7da89dd7cb..f57324b67f 100644 +--- a/lib/kernel/src/net_kernel.erl ++++ b/lib/kernel/src/net_kernel.erl +@@ -609,24 +609,16 @@ code_change(_OldVsn, State, _Extra) -> + + terminate(no_network, State) -> + lists:foreach( +- fun({Node, Type}) -> +- case Type of +- normal -> ?nodedown(Node, State); +- _ -> ok +- end +- end, get_up_nodes() ++ [{node(), normal}]); ++ fun(Node) -> ?nodedown(Node, State) ++ end, get_nodes_up_normal() ++ [node()]); + terminate(_Reason, State) -> + lists:foreach( + fun(#listen {listen = Listen,module = Mod}) -> + Mod:close(Listen) + end, State#state.listen), + lists:foreach( +- fun({Node, Type}) -> +- case Type of +- normal -> ?nodedown(Node, State); +- _ -> ok +- end +- end, get_up_nodes() ++ [{node(), normal}]). ++ fun(Node) -> ?nodedown(Node, State) ++ end, get_nodes_up_normal() ++ [node()]). + + + %% ------------------------------------------------------------ +@@ -1045,35 +1037,10 @@ disconnect_pid(Pid, State) -> + %% + %% + %% +-get_nodes(Which) -> +- get_nodes(ets:first(sys_dist), Which). + +-get_nodes('$end_of_table', _) -> +- []; +-get_nodes(Key, Which) -> +- case ets:lookup(sys_dist, Key) of +- [Conn = #connection{state = up}] -> +- [Conn#connection.node | get_nodes(ets:next(sys_dist, Key), +- Which)]; +- [Conn = #connection{}] when Which =:= all -> +- [Conn#connection.node | get_nodes(ets:next(sys_dist, Key), +- Which)]; +- _ -> +- get_nodes(ets:next(sys_dist, Key), Which) +- end. +- +-%% Return a list of all nodes that are 'up'. +-get_up_nodes() -> +- get_up_nodes(ets:first(sys_dist)). +- +-get_up_nodes('$end_of_table') -> []; +-get_up_nodes(Key) -> +- case ets:lookup(sys_dist, Key) of +- [#connection{state=up,node=Node,type=Type}] -> +- [{Node,Type}|get_up_nodes(ets:next(sys_dist, Key))]; +- _ -> +- get_up_nodes(ets:next(sys_dist, Key)) +- end. ++%% Return a list of all nodes that are 'up' and not hidden. ++get_nodes_up_normal() -> ++ ets:select(sys_dist, [{#connection{node = '$1', state = up, type = normal, _ = '_'}, [], ['$1']}]). + + ticker(Kernel, Tick) when is_integer(Tick) -> + process_flag(priority, max), +@@ -1525,15 +1492,14 @@ get_node_info(Node, Key) -> + end. + + get_nodes_info() -> +- get_nodes_info(get_nodes(all), []). +- +-get_nodes_info([Node|Nodes], InfoList) -> +- case get_node_info(Node) of +- {ok, Info} -> get_nodes_info(Nodes, [{Node, Info}|InfoList]); +- _ -> get_nodes_info(Nodes, InfoList) +- end; +-get_nodes_info([], InfoList) -> +- {ok, InfoList}. ++ Nodes = ets:select(sys_dist, [{#connection{node = '$1', _ = '_'}, [], ['$1']}]), ++ {ok, lists:filtermap( ++ fun(Node) -> ++ case get_node_info(Node) of ++ {ok, Info} -> {true, {Node, Info}}; ++ _ -> false ++ end ++ end, Nodes)}. + + %% ------------------------------------------------------------ + %% Misc. functions diff --git a/otp-0012-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch b/otp-0012-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch new file mode 100644 index 0000000..98b478b --- /dev/null +++ b/otp-0012-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch @@ -0,0 +1,22 @@ +From: "Matwey V. Kornilov" +Date: Sat, 21 Dec 2013 00:13:35 +0400 +Subject: [PATCH] In openssl 1.0.1e EC_GROUP_new_curve_GF2m function is wrapped + by #ifndef OPENSSL_NO_EC2M. We have to check whether OPENSSL_NO_EC2M is set, + and if it is, then we do not have EC_GROUP_new_curve_GF2m function and do not + HAVE_EC. + + +diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c +index e955905739..20c5dab4e7 100644 +--- a/lib/crypto/c_src/crypto.c ++++ b/lib/crypto/c_src/crypto.c +@@ -151,7 +151,8 @@ + #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'o') \ + && !defined(OPENSSL_NO_EC) \ + && !defined(OPENSSL_NO_ECDH) \ +- && !defined(OPENSSL_NO_ECDSA) ++ && !defined(OPENSSL_NO_ECDSA) \ ++ && !defined(OPENSSL_NO_EC2M) + # define HAVE_EC + #endif + diff --git a/otp-0013-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch b/otp-0013-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch new file mode 100644 index 0000000..ef280b5 --- /dev/null +++ b/otp-0013-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch @@ -0,0 +1,21 @@ +From: Peter Lemenkov +Date: Tue, 12 Feb 2019 15:50:30 +0300 +Subject: [PATCH] Revert "In openssl 1.0.1e EC_GROUP_new_curve_GF2m function is + wrapped by #ifndef OPENSSL_NO_EC2M." + +This reverts commit 805011209d744ed5aa39cd23e020bee3458ee19a. + +diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c +index 20c5dab4e7..e955905739 100644 +--- a/lib/crypto/c_src/crypto.c ++++ b/lib/crypto/c_src/crypto.c +@@ -151,8 +151,7 @@ + #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'o') \ + && !defined(OPENSSL_NO_EC) \ + && !defined(OPENSSL_NO_ECDH) \ +- && !defined(OPENSSL_NO_ECDSA) \ +- && !defined(OPENSSL_NO_EC2M) ++ && !defined(OPENSSL_NO_ECDSA) + # define HAVE_EC + #endif + diff --git a/otp-make-subpackages.py b/otp-make-subpackages.py index fd9df5e..e004bf3 100644 --- a/otp-make-subpackages.py +++ b/otp-make-subpackages.py @@ -24,7 +24,9 @@ package_headers = {} package_noarch = [ "emacs-erlang", "emacs-erlang-el", - "erlang-doc"] + "erlang-doc", + "xemacs-erlang", + "xemacs-erlang-el"] # These are additional Requires which cannot be picked up automatically (yet). # TODO these should be added automatically @@ -42,6 +44,8 @@ package_additional_requires = { # Stores files/links in /usr/share/java so has to depend on jpackage-utils "erlang-jinterface": ["%{name}-erts%{?_isa} = %{version}-%{release}", "jpackage-utils"], "erlang-wx": ["mesa-libGL", "mesa-libGLU"], + "xemacs-erlang": ["emacs-common-erlang = %{version}-%{release}", "xemacs(bin) >= %{_xemacs_version}"], + "xemacs-erlang-el": ["xemacs-erlang = %{version}-%{release}"] } package_additional_buildrequires = { @@ -66,6 +70,8 @@ package_additional_buildrequires = { "erlang-jinterface": ["java-devel"], "erlang-odbc": ["unixODBC-devel"], + "erlang-wx": ["wxGTK-devel"], + "xemacs-erlang": ["xemacs", "xemacs-packages-extra-el"], } package_additional_obsoletes = { diff --git a/sources b/sources index 674a546..72111c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.5.16.tar.gz) = 4e973be7e8ccad196d59759108a521535b0f046268eb0406f789a50f411fa27c9c11fcfb61a7218605bf1b32921bb52c52fc7c99917e1acfc0d3ed09437129b2 +SHA512 (otp-OTP-20.3.8.24.tar.gz) = e6fecc971227f6cd212b8644dd534bd757dd22e5bf7cf1e9627a344857d1969756ffac1a2bcd15e73b1e6094b335ef075f601ca24c53cb33940a671dad5f1d75