Request 1695 (superseded)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

This request is superseded by request 1705 (Show diff)

Overview

Request 1695 (superseded)

Submit erlang

Created by vanmeeuwen almost 8 years ago
In state superseded
Superseded by 1705
Open review for Admin
Open review for vanmeeuwen

Submit erlang

Submit package Kolab:Winterfell / erlang to package Kolab:16 / erlang

erlang.spec Changed

@@ -1,79 +1,32 @@
-%global need_bootstrap_set 1
+%global bootstrap 1
 
-%{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}}
+%if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7
+%global with_systemd 0
+%else
+%global with_systemd 1
+%endif
 
-%ifarch %{arm} %{mips} riscv64 %{ix86}
-# MIPS and RISC-V does not have all dependencies for fop yet.
+%ifarch %{arm}
 # 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
 
-##
-## Optional components
-##
-
-%global __with_emacs 1
-%global __with_examples 1
-%ifarch %{java_arches}
-%global __with_java 1
-%else
-%global __with_java 0
+%ifarch %{arm} %{ix86} x86_64 ppc %{power64}
+%global __with_hipe 1
 %endif
-#
-# wxWidgets plugin blocks the following ones:
-#
-# * debugger - https://bugzilla.redhat.com/1095715
-# * dialyzer - https://bugzilla.redhat.com/1095717
-# * et - https://bugzilla.redhat.com/1095718
-# * observer - https://bugzilla.redhat.com/1095721
-# * reltool - https://bugzilla.redhat.com/1095727
-#
-# debugger blocks:
-#
-# * common_test
-# * megaco
-#
-# et blocks:
-#
-# * megaco
-#
-# observer blocks:
-#
-# * common_test
-#
-# So finally we have to disable the following plugins:
-#
-# common_test
-# debugger
-# dialyzer
-# et
-# megaco
-# observer
-# reltool (*)
-# wx
-#
-%global __with_wxwidgets 1
-
 
 Name:		erlang
-Version:	25.1.2
+Version:	18.3.3
 Release:	1%{?dist}
 Summary:	General-purpose programming language and runtime environment
 
+Group:		Development/Languages
 License:	ASL 2.0
-URL:		https://www.erlang.org
-%if ! (0%{?rhel} && 0%{?rhel} <= 6)
+URL:		http://www.erlang.org
+%if 0%{?el7}%{?fedora}
 VCS:		scm:git:https://github.com/erlang/otp
 %endif
 Source0:	https://github.com/erlang/otp/archive/OTP-%{version}/otp-OTP-%{version}.tar.gz
@@ -99,82 +52,108 @@
 # for some semi-automatic patch update assistance.
 #
 # start of autogenerated patch tag list
+# Fedora specific patch
+#   Do not format man-pages and do not install miscellaneous
 Patch1: otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
+# Fedora specific patch
+#   Remove rpath
 Patch2: otp-0002-Remove-rpath.patch
+# Fedora specific patch
+#   Do not install C sources
 Patch3: otp-0003-Do-not-install-C-sources.patch
+# Fedora specific patch
+#   Do not install Java sources
 Patch4: otp-0004-Do-not-install-Java-sources.patch
+# Fedora specific patch
+#   Do not install nteventlog and related doc-files on non-win32
 Patch5: otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
+# Fedora specific patch
+#   Do not install erlang sources
 Patch6: otp-0006-Do-not-install-erlang-sources.patch
-Patch7: otp-0007-Add-extra-search-directory.patch
-Patch8: otp-0008-Avoid-forking-sed-to-get-basename.patch
-Patch9: otp-0009-Load-man-pages-from-system-wide-directory.patch
+# Fedora specific patch
+#   Split off webtool dependency from tools
+Patch7: otp-0007-Split-off-webtool-dependency-from-tools.patch
+# Fedora specific patch
+#   Add patch to crash dump on large distribution
+Patch8: otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch
+# Fedora specific patch
+#   Quickfix for cmpxchg8b inline asm when pic and gcc >= 5.0 is
+Patch10: otp-0010-Quickfix-for-cmpxchg8b-inline-asm-when-pic-and-gcc-5.patch
 # end of autogenerated patch tag list
 
-BuildRequires:	gcc
-BuildRequires:	gcc-c++
 BuildRequires:	flex
-BuildRequires:	make
 
 %if %{with doc}
-%if 0%{?need_bootstrap} < 1
+%if 0%{?bootstrap} < 1
 # Required for building docs (escript)
 BuildRequires:	erlang
 %endif
 %endif
 
-%if ! (0%{?rhel} && 0%{?rhel} <= 6)
-# for <systemd/sd-daemon.h>
-BuildRequires:	systemd-devel
-BuildRequires:	systemd
-%{?systemd_requires}
-Requires:	systemd
+%if 0%{?with_systemd}
+%if 0%{?suse_version}
+Requires(post):     systemd
+Requires(postun):   systemd
+Requires(preun):    systemd
+%else
+BuildRequires:      systemd-devel
+Requires(post):     systemd-units
+Requires(postun):   systemd-units
+Requires(preun):    coreutils
+Requires(preun):    systemd-units
+%endif
+%else
+Requires(post):     chkconfig
+Requires(post):     initscripts
+Requires(postun):   initscripts
+Requires(preun):    chkconfig
+Requires(preun):    initscripts
 %endif
+
+
 BuildRequires:	autoconf
 BuildRequires:	automake
-#BuildRequires:	erlang-rpm-macros
+BuildRequires:	erlang-rpm-macros
 
 Requires: %{name}-asn1%{?_isa} = %{version}-%{release}
-%if %{__with_wxwidgets}
 Requires: %{name}-common_test%{?_isa} = %{version}-%{release}
-%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
-%if %{__with_wxwidgets}
 Requires: %{name}-dialyzer%{?_isa} = %{version}-%{release}
-%endif # __with_wxwidgets
 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}-erl_interface%{?_isa} = %{version}-%{release}
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
-%if %{__with_wxwidgets}
 Requires: %{name}-et%{?_isa} = %{version}-%{release}
-%endif # __with_wxwidgets
 Requires: %{name}-eunit%{?_isa} = %{version}-%{release}
-Requires: %{name}-ftp%{?_isa} = %{version}-%{release}
+Requires: %{name}-gs%{?_isa} = %{version}-%{release}
+Requires: %{name}-hipe%{?_isa} = %{version}-%{release}
+Requires: %{name}-ic%{?_isa} = %{version}-%{release}
 Requires: %{name}-inets%{?_isa} = %{version}-%{release}
-%if %{__with_java}
 Requires: %{name}-jinterface%{?_isa} = %{version}-%{release}
-%endif # __with_java
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
-%if %{__with_wxwidgets}
 Requires: %{name}-megaco%{?_isa} = %{version}-%{release}
-%endif # __with_wxwidgets
 Requires: %{name}-mnesia%{?_isa} = %{version}-%{release}
-%if %{__with_wxwidgets}
 Requires: %{name}-observer%{?_isa} = %{version}-%{release}
-%endif # __with_wxwidgets
 Requires: %{name}-odbc%{?_isa} = %{version}-%{release}
+Requires: %{name}-orber%{?_isa} = %{version}-%{release}
 Requires: %{name}-os_mon%{?_isa} = %{version}-%{release}
+Requires: %{name}-ose%{?_isa} = %{version}-%{release}
+Requires: %{name}-otp_mibs%{?_isa} = %{version}-%{release}
 Requires: %{name}-parsetools%{?_isa} = %{version}-%{release}
+Requires: %{name}-percept%{?_isa} = %{version}-%{release}
 Requires: %{name}-public_key%{?_isa} = %{version}-%{release}
-%if %{__with_wxwidgets}
 Requires: %{name}-reltool%{?_isa} = %{version}-%{release}
-%endif # __with_wxwidgets
 Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release}
 Requires: %{name}-sasl%{?_isa} = %{version}-%{release}
 Requires: %{name}-snmp%{?_isa} = %{version}-%{release}
@@ -182,11 +161,11 @@
 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}-test_server%{?_isa} = %{version}-%{release}
 Requires: %{name}-tools%{?_isa} = %{version}-%{release}
-%if %{__with_wxwidgets}
+Requires: %{name}-typer%{?_isa} = %{version}-%{release}
+Requires: %{name}-webtool%{?_isa} = %{version}-%{release}
 Requires: %{name}-wx%{?_isa} = %{version}-%{release}
-%endif # __with_wxwidgets
 Requires: %{name}-xmerl%{?_isa} = %{version}-%{release}
 
 %description
@@ -197,8 +176,30 @@
 
 ### BEGIN OF AUTOGENERATED LIST ###
 
+%package -n emacs-erlang
+Summary: Compiled elisp files for erlang-mode under GNU Emacs
+Group: Applications/Editors
+BuildRequires: emacs
+BuildRequires: emacs-el
+Requires: emacs-common-erlang = %{version}-%{release}
+Requires: emacs(bin) >= %{_emacs_version}
+BuildArch: noarch
+
+%description -n emacs-erlang
+Erlang mode for GNU Emacs.
+
+%package -n emacs-erlang-el
+Summary: Elisp source files for erlang-mode under GNU Emacs
+Group: Applications/Editors
+Requires: emacs-erlang = %{version}-%{release}
+BuildArch: noarch
+
+%description -n emacs-erlang-el
+Erlang mode for GNU Emacs (source lisp files).
+
 %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}
@@ -206,9 +207,9 @@
 %description asn1
 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}
@@ -221,31 +222,114 @@
 Requires: %{name}-snmp%{?_isa} = %{version}-%{release}
 Requires: %{name}-ssh%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
-Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release}
+Requires: %{name}-test_server%{?_isa} = %{version}-%{release}
 Requires: %{name}-tools%{?_isa} = %{version}-%{release}
 Requires: %{name}-xmerl%{?_isa} = %{version}-%{release}
-Obsoletes: erlang-test_server
 
 %description common_test
 A portable framework for automatic testing.
-%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
-BuildRequires: pkgconfig(openssl)
-# FIXME there is something wrong with OpenSSL 3.0 support in Erlang right now.
-# We have to fallback to OpenSSL1 explicitly.
-#BuildRequires: openssl1.1-devel
+Group: Development/Languages
+BuildRequires: openssl-devel
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
@@ -253,9 +337,9 @@
 %description crypto
 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,26 +348,25 @@
 
 %description debugger
 A debugger for debugging and testing of Erlang programs.
-%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}
 Requires: %{name}-wx%{?_isa} = %{version}-%{release}
 Requires: graphviz
-Obsoletes: erlang-typer
 
 %description dialyzer
 A DIscrepancy AnaLYZer for ERlang programs.
-%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 +381,10 @@
 %if %{with doc}
 %package doc
 Summary: Erlang documentation
+Group: Development/Languages
 BuildRequires: fop
 BuildRequires: libxslt
+BuildArch: noarch
 
 %description doc
 Documentation for Erlang.
@@ -307,6 +392,7 @@
 
 %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 +405,7 @@
 
 %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 +417,7 @@
 
 %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 +428,7 @@
 
 %package erl_interface
 Summary: Low level interface to C
+Group: Development/Languages
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 
 %description erl_interface
@@ -347,6 +436,7 @@
 
 %package erts
 Summary: Functionality necessary to run the Erlang System itself
+Group: Development/Languages
 BuildRequires: lksctp-tools-devel
 BuildRequires: m4
 BuildRequires: ncurses-devel
@@ -361,29 +451,21 @@
 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)
-# FIXME has to be 2.16
-Provides: erlang(erl_nif_version) = 2.16
-Provides: bundled(pcre) = 8.44
+Provides: erlang(erl_nif_version) = 2.10
+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-pman
 Obsoletes: erlang-toolbar
 Obsoletes: erlang-tv
-Obsoletes: erlang-webtool
 
 %description erts
 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 +474,10 @@
 
 %description et
 An event tracer for Erlang programs.
-%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}
@@ -403,10 +485,11 @@
 %description eunit
 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}-gs%{?_isa} = %{version}-%{release}
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
 Requires: %{name}-public_key%{?_isa} = %{version}-%{release}
 Requires: %{name}-sasl%{?_isa} = %{version}-%{release}
@@ -415,19 +498,46 @@
 
 %description examples
 Examples for some Erlang modules.
-%endif %{__with_examples}
 
-%package ftp
-Summary: FTP client
+%package gs
+Summary: A library for Tcl/Tk support in Erlang
+Group: Development/Languages
+BuildRequires: tcl-devel
+BuildRequires: tk-devel
+Requires: %{name}-erts%{?_isa} = %{version}-%{release}
+Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
+Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
+Requires: tk
+
+%description gs
+A Graphics System used to write platform independent user interfaces.
+
+%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
+BuildRequires: java-devel
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
 
-%description ftp
-FTP client.
+%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}
@@ -436,30 +546,29 @@
 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
 
 %package kernel
 Summary: Main erlang library
+Group: Development/Languages
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
 
 %description kernel
 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}
@@ -472,10 +581,10 @@
 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
 
 %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}
@@ -483,9 +592,9 @@
 %description mnesia
 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}
@@ -496,10 +605,10 @@
 
 %description observer
 A set of tools for tracing and investigation of distributed systems.
-%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}
@@ -509,11 +618,26 @@
 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}
@@ -521,8 +645,30 @@
 %description os_mon
 A monitor which allows inspection of the underlying operating system.
 
+%package ose
+Summary: A module for interacting with Enea OSE
+Group: Development/Languages
+Requires: %{name}-erts%{?_isa} = %{version}-%{release}
+Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
+
+%description ose
+A module for interacting with Enea OSE.
+
+%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}
@@ -530,8 +676,21 @@
 %description parsetools
 A set of parsing and lexical analysis tools.
 
+%package percept
+Summary: A concurrency profiler tool
+Group: Development/Languages
+Requires: %{name}-erts%{?_isa} = %{version}-%{release}
+Requires: %{name}-inets%{?_isa} = %{version}-%{release}
+Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
+Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release}
+Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
+
+%description percept
+A concurrency profiler tool.
+
 %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}
@@ -541,9 +700,9 @@
 %description public_key
 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}
@@ -558,10 +717,10 @@
 dependencies and enables interactive customization of a
 target system. The backend provides a batch interface
 for generation of customized target systems.
-%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}
@@ -572,6 +731,7 @@
 
 %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}
@@ -583,6 +743,7 @@
 
 %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}
@@ -596,6 +757,7 @@
 
 %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}
@@ -607,6 +769,7 @@
 
 %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}
@@ -619,6 +782,7 @@
 
 %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}
@@ -629,6 +793,7 @@
 
 %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}
@@ -638,41 +803,70 @@
 A utility used to handle abstract Erlang syntax trees,
 reading source files differently, pretty-printing syntax trees.
 
-%package tftp
-Summary: TFTP client
+%package test_server
+Summary: The OTP Test Server
+Group: Development/Languages
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
+Requires: %{name}-inets%{?_isa} = %{version}-%{release}
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
+Requires: %{name}-observer%{?_isa} = %{version}-%{release}
+Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
+Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release}
+Requires: %{name}-tools%{?_isa} = %{version}-%{release}
 
-%description tftp
-TFTP client.
+%description test_server
+The OTP Test Server.
 
 %package tools
 Summary: A set of programming tools including a coverage analyzer etc
-%if %{__with_emacs}
-BuildRequires: emacs
-BuildRequires: emacs-el
-%endif %{__with_emacs}
+Group: Development/Languages
 Requires: %{name}-compiler%{?_isa} = %{version}-%{release}
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-inets%{?_isa} = %{version}-%{release}
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
 Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
-%if %{__with_emacs}
-Requires: emacs-filesystem
-Obsoletes: emacs-erlang
-Obsoletes: emacs-erlang-el
-%endif %{__with_emacs}
-
+# This is a weak dependency triggered by the "cover_web" application.
+# Unfortunately Recommends/Suggests tags are supported only in Fedora 21+ and
+# RHEL 8+ (eventually)
+%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
+Suggests: %{name}-webtool%{?_isa} = %{version}-%{release}
+%endif
+Provides: emacs-common-erlang = %{version}-%{release}
 
 %description tools
 A set of programming tools including a coverage analyzer etc.
 
-%if %{__with_wxwidgets}
+%package typer
+Summary: TYPe annotator for ERlang programs
+Group: Development/Languages
+Requires: %{name}-compiler%{?_isa} = %{version}-%{release}
+Requires: %{name}-dialyzer%{?_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 typer
+TYPe annotator for ERlang programs.
+
+%package webtool
+Summary: A tool that simplifying the use of web based Erlang tools
+Group: Development/Languages
+Requires: %{name}-erts%{?_isa} = %{version}-%{release}
+Requires: %{name}-inets%{?_isa} = %{version}-%{release}
+Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
+Requires: %{name}-observer%{?_isa} = %{version}-%{release}
+Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
+
+%description webtool
+A tool that simplifying the use of web based Erlang tools.
+
 %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}
@@ -681,10 +875,10 @@
 
 %description wx
 A Graphics System used to write platform independent user interfaces.
-%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}
@@ -692,20 +886,54 @@
 %description xmerl
 Provides support for XML 1.0.
 
+%package -n xemacs-erlang
+Summary: Compiled elisp files for erlang-mode under XEmacs
+Group: Applications/Editors
+BuildRequires: xemacs
+BuildRequires: xemacs-packages-extra-el
+Requires: emacs-common-erlang = %{version}-%{release}
+Requires: xemacs(bin) >= %{_xemacs_version}
+BuildArch: noarch
+
+%description -n xemacs-erlang
+Erlang mode for XEmacs.
+
+%package -n xemacs-erlang-el
+Summary: Elisp source files for erlang-mode under XEmacs
+Group: Applications/Editors
+Requires: xemacs-erlang = %{version}-%{release}
+BuildArch: noarch
+
+%description -n xemacs-erlang-el
+Erlang mode for XEmacs (source lisp files).
+
 ### END OF AUTOGENERATED LIST ###
 
 %prep
-%autosetup -p1 -n otp-OTP-%{version}
+%setup -q -n otp-OTP-%{version}
+
+# start of autogenerated prep patch list
+%patch1 -p1 -b .Do_not_format_man_pages_and_do_not_install_miscellan
+%patch2 -p1 -b .Remove_rpath
+%patch3 -p1 -b .Do_not_install_C_sources
+%patch4 -p1 -b .Do_not_install_Java_sources
+%patch5 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n
+%patch6 -p1 -b .Do_not_install_erlang_sources
+%patch7 -p1 -b .Split_off_webtool_dependency_from_tools
+%patch8 -p1 -b .Add_patch_to_crash_dump_on_large_distribution
+%patch10 -p1 -b .Quickfix_for_cmpxchg8b_inline_asm_when_pic_and_gcc_5
+# end of autogenerated prep patch list
 
 # FIXME we should come up with a better solution
 # remove shipped zlib sources
 #rm -f erts/emulator/zlib/*.ch
 
-
-%build
 # Reconfigure everything to apply changes to the autotools templates
 ./otp_build autoconf
 
+
+%build
+
 # Set up proper cflags/cxxflags first
 %ifarch sparcv9 sparc64
 ERL_FLAGS="${RPM_OPT_FLAGS} -mcpu=ultrasparc -fno-strict-aliasing"
@@ -713,37 +941,18 @@
 ERL_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing"
 %endif
 
-# Kernel poll is buggy on s390x for unknown reasons, disable it
-# See rhbz#1770256
-%ifarch s390x
-%define __without_kernel_poll 1
+CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure \
+    --enable-shared-zlib \
+    --enable-sctp \
+%if 0%{?with_systemd}
+    --enable-systemd \
 %endif
-
-CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib --enable-sctp --enable-systemd --disable-silent-rules \
-        %{?__without_kernel_poll:--disable-kernel-poll} \
-        %{?with_fips:--enable-fips} \
-%if %{__with_java}
-	\
-%else
-	--without-jinterface \
-%endif # __with_java
-%if %{__with_wxwidgets}
-	--with-wx-config=/usr/bin/wx-config
-%else
-	--without-common_test \
-	--without-debugger \
-	--without-dialyzer \
-	--without-et \
-	--without-megaco \
-	--without-observer \
-	--without-reltool \
-	--without-wx
-%endif # __with_wxwidgets
+    %{?__with_hipe:--enable-hipe} \
+    --with-wx-config=/usr/bin/wx-config-3.0
 
 # Remove pre-built BEAM files
 make clean
 
-%if %{__with_emacs}
 # GNU Emacs/XEmacs related stuff
 erlang_tools_vsn="$(sed -n 's/TOOLS_VSN = //p' lib/tools/vsn.mk)"
 
@@ -759,9 +968,22 @@
 pushd emacs-erlang
 %{_emacs_bytecompile} *.el
 popd
-%endif %{__with_emacs}
 
-make
+# XEmacs related stuff
+cat > 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
+pushd xemacs-erlang
+%{_xemacs_bytecompile} *.el
+popd
+
+make %{?_smp_flags}
 
 %if %{with doc}
 # should use FOP_OPTS after #832323 is resolved
@@ -775,7 +997,6 @@
 
 
 %install
-%if %{__with_emacs}
 # GNU Emacs/XEmacs related stuff
 erlang_tools_vsn="$(sed -n 's/TOOLS_VSN = //p' lib/tools/vsn.mk)"
 
@@ -789,7 +1010,18 @@
 		"$RPM_BUILD_ROOT%{_emacs_sitelispdir}/erlang/"
 done
 install -m 0644 emacs-erlang/*.elc "$RPM_BUILD_ROOT%{_emacs_sitelispdir}/erlang/"
-%endif %{__with_emacs}
+
+# 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/"
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
@@ -800,15 +1032,9 @@
 # Do not install info files - they are almost empty and useless
 find $RPM_BUILD_ROOT%{_libdir}/erlang -type f -name info -exec rm -f {} \;
 
-%if %{__with_examples}
 # fix 0775 permission on some directories
-find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/ -type d -perm 0775 -print -exec chmod 755 {} \;
-find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist -type d -perm 0775 -print -exec chmod 755 {} \;
-%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}
-
+find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/ -type d -perm 0775 | xargs chmod 755
+find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist -type d -perm 0775 | xargs chmod 755
 chmod 0755 $RPM_BUILD_ROOT%{_libdir}/erlang/bin
 
 # Relocate doc-files into the proper directory
@@ -819,18 +1045,12 @@
 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}
+mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-# We'll package it by marking it explicitly as doc - see below
-rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/README.md
 %endif
 
 # Win32-specific man-pages
@@ -841,17 +1061,6 @@
 # remove empty directory
 rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/man
 
-%if %{with doc}
-# Move man-pages to a system-wide directory - in the same way as Debian did
-# Erlang files from man 3 have too generic names
-for manpage in $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/*
-do
-	mv ${manpage} ${manpage}erl
-done
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/
-mv $RPM_BUILD_ROOT%{_libdir}/erlang/man/* $RPM_BUILD_ROOT%{_mandir}/
-%endif
-
 # remove outdated script
 rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/Install
 
@@ -875,18 +1084,21 @@
 	fi
 done
 
-%if %{__with_java}
 # 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
 
 # systemd-related stuff
-%if ! (0%{?rhel} && 0%{?rhel} <= 6)
+%if 0%{?with_systemd}
 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
@@ -894,37 +1106,15 @@
 %endif
 
 
-%if %{__with_wxwidgets}
-echo "No need to fix additional scripts"
-%else
-# FIXME workaround for broken Erlang install procedure
-echo "Removing scripts which won't work w/o wxWidgets anyway"
-for exe in ct_run dialyzer typer
-do
-	rm -f $RPM_BUILD_ROOT/%{_bindir}/${exe}
-	rm -f $RPM_BUILD_ROOT/%{_libdir}/erlang/bin/${exe}
-	rm -f $RPM_BUILD_ROOT/%{_libdir}/erlang/erts-*/bin/${exe}
-done
-%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
-
-
 %check
-TARGET="$(make target_configured)"
-ERL_TOP="$(pwd)"
-ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests
-# Unfortunately running the tests will take several hours. So we build the
-# package w/o tests for now. See this:
-# https://github.com/erlang/otp/wiki/Running-tests
+# FIXME run tests somehow
+# make tests || exit 0
 
 
 %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 \
+useradd -r -g epmd -d /tmp -s /sbin/nologin \
 -c "Erlang Port Mapper Daemon" epmd 2>/dev/null || :
 
 
@@ -935,6 +1125,7 @@
 %doc %{_docdir}/%{name}-%{version}/COPYRIGHT
 %doc %{_docdir}/%{name}-%{version}/LICENSE.txt
 %doc %{_docdir}/%{name}-%{version}/PR.template
+%doc %{_docdir}/%{name}-%{version}/README
 %doc %{_docdir}/%{name}-%{version}/README.md
 %endif
 
@@ -944,77 +1135,177 @@
 %{_libdir}/erlang/lib/asn1-*/priv
 %{_libdir}/erlang/lib/asn1-*/src
 %if %{with doc}
-%{_mandir}/man3/asn1ct.*
+%{_libdir}/erlang/man/man3/asn1ct.*
+%{_libdir}/erlang/man/man3/asn1rt.*
 %endif
 
-%if %{__with_wxwidgets}
 %files common_test
 %{_bindir}/ct_run
-%{_libdir}/erlang/bin/ct_run
-%{_libdir}/erlang/erts-*/bin/ct_run
 %{_libdir}/erlang/lib/common_test-*/
 %if %{with doc}
-%{_mandir}/man1/ct_run.*
-%{_mandir}/man3/ct.*
-%{_mandir}/man3/ct_cover.*
-%{_mandir}/man3/ct_ftp.*
-%{_mandir}/man3/ct_hooks.*
-%{_mandir}/man3/ct_master.*
-%{_mandir}/man3/ct_netconfc.*
-%{_mandir}/man3/ct_property_test.*
-%{_mandir}/man3/ct_rpc.*
-%{_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.*
+%{_libdir}/erlang/man/man3/ct.*
+%{_libdir}/erlang/man/man3/ct_cover.*
+%{_libdir}/erlang/man/man3/ct_ftp.*
+%{_libdir}/erlang/man/man3/ct_hooks.*
+%{_libdir}/erlang/man/man3/ct_master.*
+%{_libdir}/erlang/man/man3/ct_netconfc.*
+%{_libdir}/erlang/man/man3/ct_property_test.*
+%{_libdir}/erlang/man/man3/ct_rpc.*
+%{_libdir}/erlang/man/man3/ct_slave.*
+%{_libdir}/erlang/man/man3/ct_snmp.*
+%{_libdir}/erlang/man/man3/ct_ssh.*
+%{_libdir}/erlang/man/man3/ct_telnet.*
+%{_libdir}/erlang/man/man3/unix_telnet.*
+%{_libdir}/erlang/man/man6/common_test.*
 %endif
-%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.*
+%{_libdir}/erlang/man/man3/compile.*
+%endif
+
+%files cosEvent
+%{_libdir}/erlang/lib/cosEvent-*/
+%if %{with doc}
+%{_libdir}/erlang/man/man3/cosEventApp.*
+%{_libdir}/erlang/man/man3/CosEventChannelAdmin.*
+%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ConsumerAdmin.*
+%{_libdir}/erlang/man/man3/CosEventChannelAdmin_EventChannel.*
+%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPullConsumer.*
+%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPullSupplier.*
+%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPushConsumer.*
+%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPushSupplier.*
+%{_libdir}/erlang/man/man3/CosEventChannelAdmin_SupplierAdmin.*
+%endif
+
+%files cosEventDomain
+%{_libdir}/erlang/lib/cosEventDomain-*/
+%if %{with doc}
+%{_libdir}/erlang/man/man3/CosEventDomainAdmin.*
+%{_libdir}/erlang/man/man3/CosEventDomainAdmin_EventDomain.*
+%{_libdir}/erlang/man/man3/CosEventDomainAdmin_EventDomainFactory.*
+%{_libdir}/erlang/man/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}
+%{_libdir}/erlang/man/man3/cosFileTransferApp.*
+%{_libdir}/erlang/man/man3/CosFileTransfer_Directory.*
+%{_libdir}/erlang/man/man3/CosFileTransfer_File.*
+%{_libdir}/erlang/man/man3/CosFileTransfer_FileIterator.*
+%{_libdir}/erlang/man/man3/CosFileTransfer_FileTransferSession.*
+%{_libdir}/erlang/man/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}
+%{_libdir}/erlang/man/man3/CosNotification.*
+%{_libdir}/erlang/man/man3/CosNotification_AdminPropertiesAdmin.*
+%{_libdir}/erlang/man/man3/cosNotificationApp.*
+%{_libdir}/erlang/man/man3/CosNotification_QoSAdmin.*
+%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ConsumerAdmin.*
+%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_EventChannel.*
+%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_EventChannelFactory.*
+%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyConsumer.*
+%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPullConsumer.*
+%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPullSupplier.*
+%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPushConsumer.*
+%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPushSupplier.*
+%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxySupplier.*
+%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPullConsumer.*
+%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPullSupplier.*
+%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPushConsumer.*
+%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPushSupplier.*
+%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPullConsumer.*
+%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPullSupplier.*
+%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPushConsumer.*
+%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPushSupplier.*
+%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SupplierAdmin.*
+%{_libdir}/erlang/man/man3/CosNotifyComm_NotifyPublish.*
+%{_libdir}/erlang/man/man3/CosNotifyComm_NotifySubscribe.*
+%{_libdir}/erlang/man/man3/CosNotifyFilter_Filter.*
+%{_libdir}/erlang/man/man3/CosNotifyFilter_FilterAdmin.*
+%{_libdir}/erlang/man/man3/CosNotifyFilter_FilterFactory.*
+%{_libdir}/erlang/man/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}
+%{_libdir}/erlang/man/man3/cosProperty.*
+%{_libdir}/erlang/man/man3/CosPropertyService_PropertiesIterator.*
+%{_libdir}/erlang/man/man3/CosPropertyService_PropertyNamesIterator.*
+%{_libdir}/erlang/man/man3/CosPropertyService_PropertySet.*
+%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetDef.*
+%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetDefFactory.*
+%{_libdir}/erlang/man/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}
+%{_libdir}/erlang/man/man3/cosTime.*
+%{_libdir}/erlang/man/man3/CosTimerEvent_TimerEventHandler.*
+%{_libdir}/erlang/man/man3/CosTimerEvent_TimerEventService.*
+%{_libdir}/erlang/man/man3/CosTime_TimeService.*
+%{_libdir}/erlang/man/man3/CosTime_TIO.*
+%{_libdir}/erlang/man/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}
+%{_libdir}/erlang/man/man3/cosTransactions.*
+%{_libdir}/erlang/man/man3/CosTransactions_Control.*
+%{_libdir}/erlang/man/man3/CosTransactions_Coordinator.*
+%{_libdir}/erlang/man/man3/CosTransactions_RecoveryCoordinator.*
+%{_libdir}/erlang/man/man3/CosTransactions_Resource.*
+%{_libdir}/erlang/man/man3/CosTransactions_SubtransactionAwareResource.*
+%{_libdir}/erlang/man/man3/CosTransactions_Terminator.*
+%{_libdir}/erlang/man/man3/CosTransactions_TransactionFactory.*
 %endif
 
 %files crypto
 %{_libdir}/erlang/lib/crypto-*/
 %if %{with doc}
-%{_mandir}/man3/crypto.*
-%{_mandir}/man6/crypto.*
+%{_libdir}/erlang/man/man3/crypto.*
+%{_libdir}/erlang/man/man6/crypto.*
 %endif
 
-%if %{__with_wxwidgets}
 %files debugger
 %{_libdir}/erlang/lib/debugger-*/
 %if %{with doc}
-%{_mandir}/man3/debugger.*
-%{_mandir}/man3/i.*
-%{_mandir}/man3/int.*
+%{_libdir}/erlang/man/man3/debugger.*
+%{_libdir}/erlang/man/man3/i.*
+%{_libdir}/erlang/man/man3/int.*
 %endif
-%endif # __with_wxwidgets
 
-%if %{__with_wxwidgets}
 %files dialyzer
 %{_bindir}/dialyzer
-# FIXME FIXME FIXME this must be installed properly!!!!!!
-%{_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/typer.*
-%{_mandir}/man3/dialyzer.*
+%{_libdir}/erlang/man/man3/dialyzer.*
 %endif
-%endif # __with_wxwidgets
 
 %files diameter
 %dir %{_libdir}/erlang/lib/diameter-*/
@@ -1023,20 +1314,19 @@
 %{_libdir}/erlang/lib/diameter-*/include
 %{_libdir}/erlang/lib/diameter-*/src
 %if %{with doc}
-%{_mandir}/man1/diameterc.*
-%{_mandir}/man3/diameter.*
-%{_mandir}/man3/diameter_app.*
-%{_mandir}/man3/diameter_codec.*
-%{_mandir}/man3/diameter_make.*
-%{_mandir}/man3/diameter_sctp.*
-%{_mandir}/man3/diameter_tcp.*
-%{_mandir}/man3/diameter_transport.*
-%{_mandir}/man4/diameter_dict.*
+%{_libdir}/erlang/man/man1/diameterc.*
+%{_libdir}/erlang/man/man3/diameter.*
+%{_libdir}/erlang/man/man3/diameter_app.*
+%{_libdir}/erlang/man/man3/diameter_codec.*
+%{_libdir}/erlang/man/man3/diameter_make.*
+%{_libdir}/erlang/man/man3/diameter_sctp.*
+%{_libdir}/erlang/man/man3/diameter_tcp.*
+%{_libdir}/erlang/man/man3/diameter_transport.*
+%{_libdir}/erlang/man/man4/diameter_dict.*
 %endif
 
 %if %{with doc}
 %files doc
-%{_libdir}/erlang/lib/*/doc
 %doc %{_docdir}/%{name}-%{version}/doc
 %doc %{_docdir}/%{name}-%{version}/erts-*/
 %doc %{_docdir}/%{name}-%{version}/lib/
@@ -1045,56 +1335,57 @@
 %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.*
+%{_libdir}/erlang/man/man3/edoc.*
+%{_libdir}/erlang/man/man3/edoc_doclet.*
+%{_libdir}/erlang/man/man3/edoc_extract.*
+%{_libdir}/erlang/man/man3/edoc_layout.*
+%{_libdir}/erlang/man/man3/edoc_lib.*
+%{_libdir}/erlang/man/man3/edoc_run.*
 %endif
 
 %files eldap
 %{_libdir}/erlang/lib/eldap-*/
 %if %{with doc}
-%{_mandir}/man3/eldap.*
+%{_libdir}/erlang/man/man3/eldap.*
 %endif
 
 %files erl_docgen
 %{_libdir}/erlang/lib/erl_docgen-*/
 %if %{with doc}
-%{_mandir}/man6/erl_docgen.*
+%{_libdir}/erlang/man/man6/erl_docgen.*
 %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.*
+%{_libdir}/erlang/man/man1/erl_call.*
+%{_libdir}/erlang/man/man3/ei.*
+%{_libdir}/erlang/man/man3/ei_connect.*
+%{_libdir}/erlang/man/man3/erl_connect.*
+%{_libdir}/erlang/man/man3/erl_error.*
+%{_libdir}/erlang/man/man3/erl_eterm.*
+%{_libdir}/erlang/man/man3/erl_format.*
+%{_libdir}/erlang/man/man3/erl_global.*
+%{_libdir}/erlang/man/man3/erl_malloc.*
+%{_libdir}/erlang/man/man3/erl_marshal.*
+%{_libdir}/erlang/man/man3/registry.*
 %endif
 
 %files erts
 # TODO
 # In order to have a parallel-installable Erlang packages these directories
 # should be packaged separately
-%dir %{_datadir}/erlang/
-%dir %{_datadir}/erlang/lib/
 %dir %{_libdir}/erlang/
 %dir %{_libdir}/erlang/bin/
 %dir %{_libdir}/erlang/lib/
+%if %{with doc}
+%dir %{_libdir}/erlang/man/
+%dir %{_libdir}/erlang/man/man1/
+%dir %{_libdir}/erlang/man/man3/
+%dir %{_libdir}/erlang/man/man4/
+%dir %{_libdir}/erlang/man/man6/
+%dir %{_libdir}/erlang/man/man7/
+%endif
 %dir %{_libdir}/erlang/releases/
 
 %{_bindir}/epmd
@@ -1103,6 +1394,7 @@
 %{_bindir}/escript
 %{_bindir}/run_erl
 %{_bindir}/to_erl
+%{_libdir}/erlang/bin/ct_run
 %{_libdir}/erlang/bin/epmd
 %{_libdir}/erlang/bin/erl
 %{_libdir}/erlang/bin/erlc
@@ -1118,12 +1410,14 @@
 %{_libdir}/erlang/bin/to_erl
 %dir %{_libdir}/erlang/erts-*/
 %dir %{_libdir}/erlang/erts-*/bin/
+%{_libdir}/erlang/erts-*/bin/beam
 %{_libdir}/erlang/erts-*/bin/beam.smp
+%{_libdir}/erlang/erts-*/bin/child_setup
+%{_libdir}/erlang/erts-*/bin/ct_run
 %{_libdir}/erlang/erts-*/bin/dyn_erl
 %{_libdir}/erlang/erts-*/bin/epmd
 %{_libdir}/erlang/erts-*/bin/erl
 %{_libdir}/erlang/erts-*/bin/erl.src
-%{_libdir}/erlang/erts-*/bin/erl_child_setup
 %{_libdir}/erlang/erts-*/bin/erlc
 %{_libdir}/erlang/erts-*/bin/erlexec
 %{_libdir}/erlang/erts-*/bin/escript
@@ -1134,57 +1428,48 @@
 %{_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/
 %{_libdir}/erlang/lib/erts-*/
 %if %{with doc}
-%{_mandir}/man1/epmd.*
-%{_mandir}/man1/erl.*
-%{_mandir}/man1/erlc.*
-%{_mandir}/man1/escript.*
-%{_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.*
-%{_mandir}/man3/erl_prim_loader.*
-%{_mandir}/man3/erl_tracer.*
-%{_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.*
+%{_libdir}/erlang/man/man1/ct_run.*
+%{_libdir}/erlang/man/man1/epmd.*
+%{_libdir}/erlang/man/man1/erl.*
+%{_libdir}/erlang/man/man1/erlc.*
+%{_libdir}/erlang/man/man1/escript.*
+%{_libdir}/erlang/man/man1/run_erl.*
+%{_libdir}/erlang/man/man1/start.*
+%{_libdir}/erlang/man/man1/start_erl.*
+%{_libdir}/erlang/man/man3/driver_entry.*
+%{_libdir}/erlang/man/man3/erl_driver.*
+%{_libdir}/erlang/man/man3/erl_nif.*
+%{_libdir}/erlang/man/man3/erl_prim_loader.*
+%{_libdir}/erlang/man/man3/erlang.*
+%{_libdir}/erlang/man/man3/erts_alloc.*
+%{_libdir}/erlang/man/man3/init.*
+%{_libdir}/erlang/man/man3/zlib.*
 %endif
 %{_libdir}/erlang/releases/*
 %{_libdir}/erlang/usr/
-%if ! (0%{?rhel} && 0%{?rhel} <= 6)
+%if 0%{?with_systemd}
 %{_unitdir}/epmd.service
 %{_unitdir}/epmd.socket
 %{_unitdir}/epmd@.service
 %{_unitdir}/epmd@.socket
 %endif
 
-%if %{__with_wxwidgets}
 %files et
 %dir %{_libdir}/erlang/lib/et-*/
 %{_libdir}/erlang/lib/et-*/ebin
 %{_libdir}/erlang/lib/et-*/include
 %{_libdir}/erlang/lib/et-*/src
 %if %{with doc}
-%{_mandir}/man3/et.*
-%{_mandir}/man3/et_collector.*
-%{_mandir}/man3/et_selector.*
-%{_mandir}/man3/et_viewer.*
+%{_libdir}/erlang/man/man3/et.*
+%{_libdir}/erlang/man/man3/et_collector.*
+%{_libdir}/erlang/man/man3/et_selector.*
+%{_libdir}/erlang/man/man3/et_viewer.*
 %endif
-%endif # __with_wxwidgets
 
 %files eunit
 %dir %{_libdir}/erlang/lib/eunit-*/
@@ -1192,30 +1477,24 @@
 %{_libdir}/erlang/lib/eunit-*/include
 %{_libdir}/erlang/lib/eunit-*/src
 %if %{with doc}
-%{_mandir}/man3/eunit.*
-%{_mandir}/man3/eunit_surefire.*
+%{_libdir}/erlang/man/man3/eunit.*
+%{_libdir}/erlang/man/man3/eunit_surefire.*
 %endif
 
-%if %{__with_examples}
 %files examples
 %{_libdir}/erlang/lib/asn1-*/examples/
 %{_libdir}/erlang/lib/diameter-*/examples/
-%if %{__with_wxwidgets}
 %{_libdir}/erlang/lib/et-*/examples/
-%endif # __with_wxwidgets
 %{_libdir}/erlang/lib/eunit-*/examples/
+%{_libdir}/erlang/lib/gs-*/examples/
+%{_libdir}/erlang/lib/ic-*/examples/
 %{_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
-%if %{__with_wxwidgets}
+%{_libdir}/erlang/lib/orber-*/examples/
 %{_libdir}/erlang/lib/reltool-*/examples/
-%endif # __with_wxwidgets
 %{_libdir}/erlang/lib/runtime_tools-*/examples/
 %{_libdir}/erlang/lib/sasl-*/examples/
 %{_libdir}/erlang/lib/snmp-*/examples/
@@ -1223,17 +1502,34 @@
 %{_libdir}/erlang/lib/stdlib-*/examples/
 %{_libdir}/erlang/lib/syntax_tools-*/examples/
 %{_libdir}/erlang/lib/tools-*/examples/
-%if %{__with_wxwidgets}
 %{_libdir}/erlang/lib/wx-*/examples/
-%endif # __with_wxwidgets
-%endif %{__with_examples}
 
-%files ftp
-%dir %{_libdir}/erlang/lib/ftp-*/
-%{_libdir}/erlang/lib/ftp-*/ebin
-%{_libdir}/erlang/lib/ftp-*/src
-%if %{with doc}
-%{_mandir}/man3/ftp.*
+%files gs
+%dir %{_libdir}/erlang/lib/gs-*/
+%{_libdir}/erlang/lib/gs-*/contribs
+%{_libdir}/erlang/lib/gs-*/ebin
+%{_libdir}/erlang/lib/gs-*/priv
+%{_libdir}/erlang/lib/gs-*/src
+%if %{with doc}
+%{_libdir}/erlang/man/man3/gs.*
+%endif
+
+%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
+# FIXME see erlang-jinterface also
+#%dir %{_javadir}/%{name}/
+%{_javadir}/%{name}/ic.jar
+%if %{with doc}
+%{_libdir}/erlang/man/man3/ic.*
+%{_libdir}/erlang/man/man3/ic_clib.*
+%{_libdir}/erlang/man/man3/ic_c_protocol.*
 %endif
 
 %files inets
@@ -1243,30 +1539,26 @@
 %{_libdir}/erlang/lib/inets-*/priv
 %{_libdir}/erlang/lib/inets-*/src
 %if %{with doc}
-%{_mandir}/man3/ftp.*
-%{_mandir}/man3/http_uri.*
-%{_mandir}/man3/httpc.*
-%{_mandir}/man3/httpd.*
-%{_mandir}/man3/httpd_custom_api.*
-%{_mandir}/man3/httpd_socket.*
-%{_mandir}/man3/httpd_util.*
-%{_mandir}/man3/inets.*
-%{_mandir}/man3/mod_alias.*
-%{_mandir}/man3/mod_auth.*
-%{_mandir}/man3/mod_esi.*
-%{_mandir}/man3/mod_security.*
-%{_mandir}/man3/tftp.*
+%{_libdir}/erlang/man/man3/ftp.*
+%{_libdir}/erlang/man/man3/http_uri.*
+%{_libdir}/erlang/man/man3/httpc.*
+%{_libdir}/erlang/man/man3/httpd.*
+%{_libdir}/erlang/man/man3/httpd_custom_api.*
+%{_libdir}/erlang/man/man3/httpd_socket.*
+%{_libdir}/erlang/man/man3/httpd_util.*
+%{_libdir}/erlang/man/man3/inets.*
+%{_libdir}/erlang/man/man3/mod_alias.*
+%{_libdir}/erlang/man/man3/mod_auth.*
+%{_libdir}/erlang/man/man3/mod_esi.*
+%{_libdir}/erlang/man/man3/mod_security.*
+%{_libdir}/erlang/man/man3/tftp.*
 %endif
 
-%if %{__with_java}
 %files jinterface
-%dir %{_javadir}/%{name}/
+# FIXME see erlang-ic also
+#%dir %{_javadir}/%{name}/
 %{_javadir}/%{name}/OtpErlang.jar
 %{_libdir}/erlang/lib/jinterface-*/
-%if %{with doc}
-%{_mandir}/man3/jinterface.*
-%endif
-%endif # __with_java
 
 %files kernel
 %dir %{_libdir}/erlang/lib/kernel-*/
@@ -1274,48 +1566,40 @@
 %{_libdir}/erlang/lib/kernel-*/include
 %{_libdir}/erlang/lib/kernel-*/src
 %if %{with doc}
-%{_mandir}/man3/application.*
-%{_mandir}/man3/auth.*
-%{_mandir}/man3/code.*
-%{_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.*
-%{_mandir}/man3/gen_sctp.*
-%{_mandir}/man3/gen_tcp.*
-%{_mandir}/man3/gen_udp.*
-%{_mandir}/man3/global.*
-%{_mandir}/man3/global_group.*
-%{_mandir}/man3/heart.*
-%{_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/rpc.*
-%{_mandir}/man3/seq_trace.*
-%{_mandir}/man3/user.*
-%{_mandir}/man3/wrap_log_reader.*
-%{_mandir}/man3/zlib_stub.*
-%{_mandir}/man4/app.*
-%{_mandir}/man4/config.*
-%{_mandir}/man6/kernel.*
+%{_libdir}/erlang/man/man3/application.*
+%{_libdir}/erlang/man/man3/auth.*
+%{_libdir}/erlang/man/man3/code.*
+%{_libdir}/erlang/man/man3/disk_log.*
+%{_libdir}/erlang/man/man3/erl_boot_server.*
+%{_libdir}/erlang/man/man3/erl_ddll.*
+%{_libdir}/erlang/man/man3/erl_prim_loader_stub.*
+%{_libdir}/erlang/man/man3/erlang_stub.*
+%{_libdir}/erlang/man/man3/error_handler.*
+%{_libdir}/erlang/man/man3/error_logger.*
+%{_libdir}/erlang/man/man3/file.*
+%{_libdir}/erlang/man/man3/gen_sctp.*
+%{_libdir}/erlang/man/man3/gen_tcp.*
+%{_libdir}/erlang/man/man3/gen_udp.*
+%{_libdir}/erlang/man/man3/global.*
+%{_libdir}/erlang/man/man3/global_group.*
+%{_libdir}/erlang/man/man3/heart.*
+%{_libdir}/erlang/man/man3/inet.*
+%{_libdir}/erlang/man/man3/inet_res.*
+%{_libdir}/erlang/man/man3/init_stub.*
+%{_libdir}/erlang/man/man3/net_adm.*
+%{_libdir}/erlang/man/man3/net_kernel.*
+%{_libdir}/erlang/man/man3/os.*
+%{_libdir}/erlang/man/man3/pg2.*
+%{_libdir}/erlang/man/man3/rpc.*
+%{_libdir}/erlang/man/man3/seq_trace.*
+%{_libdir}/erlang/man/man3/user.*
+%{_libdir}/erlang/man/man3/wrap_log_reader.*
+%{_libdir}/erlang/man/man3/zlib_stub.*
+%{_libdir}/erlang/man/man4/app.*
+%{_libdir}/erlang/man/man4/config.*
+%{_libdir}/erlang/man/man6/kernel.*
 %endif
 
-%if %{__with_wxwidgets}
 %files megaco
 %dir %{_libdir}/erlang/lib/megaco-*/
 %{_libdir}/erlang/lib/megaco-*/ebin
@@ -1323,32 +1607,30 @@
 %{_libdir}/erlang/lib/megaco-*/priv
 %{_libdir}/erlang/lib/megaco-*/src
 %if %{with doc}
-%{_mandir}/man3/megaco.*
-%{_mandir}/man3/megaco_codec_meas.*
-%{_mandir}/man3/megaco_codec_mstone1.*
-%{_mandir}/man3/megaco_codec_mstone2.*
-%{_mandir}/man3/megaco_codec_transform.*
-%{_mandir}/man3/megaco_edist_compress.*
-%{_mandir}/man3/megaco_encoder.*
-%{_mandir}/man3/megaco_flex_scanner.*
-%{_mandir}/man3/megaco_tcp.*
-%{_mandir}/man3/megaco_transport.*
-%{_mandir}/man3/megaco_udp.*
-%{_mandir}/man3/megaco_user.*
+%{_libdir}/erlang/man/man3/megaco.*
+%{_libdir}/erlang/man/man3/megaco_codec_meas.*
+%{_libdir}/erlang/man/man3/megaco_codec_mstone1.*
+%{_libdir}/erlang/man/man3/megaco_codec_mstone2.*
+%{_libdir}/erlang/man/man3/megaco_codec_transform.*
+%{_libdir}/erlang/man/man3/megaco_edist_compress.*
+%{_libdir}/erlang/man/man3/megaco_encoder.*
+%{_libdir}/erlang/man/man3/megaco_flex_scanner.*
+%{_libdir}/erlang/man/man3/megaco_tcp.*
+%{_libdir}/erlang/man/man3/megaco_transport.*
+%{_libdir}/erlang/man/man3/megaco_udp.*
+%{_libdir}/erlang/man/man3/megaco_user.*
 %endif
-%endif # __with_wxwidgets
 
 %files mnesia
 %dir %{_libdir}/erlang/lib/mnesia-*/
 %{_libdir}/erlang/lib/mnesia-*/ebin
 %{_libdir}/erlang/lib/mnesia-*/src
 %if %{with doc}
-%{_mandir}/man3/mnesia.*
-%{_mandir}/man3/mnesia_frag_hash.*
-%{_mandir}/man3/mnesia_registry.*
+%{_libdir}/erlang/man/man3/mnesia.*
+%{_libdir}/erlang/man/man3/mnesia_frag_hash.*
+%{_libdir}/erlang/man/man3/mnesia_registry.*
 %endif
 
-%if %{__with_wxwidgets}
 %files observer
 %dir %{_libdir}/erlang/lib/observer-*/
 %{_libdir}/erlang/lib/observer-*/ebin/
@@ -1356,54 +1638,102 @@
 %{_libdir}/erlang/lib/observer-*/priv/
 %{_libdir}/erlang/lib/observer-*/src/
 %if %{with doc}
-%{_mandir}/man1/cdv.*
-%{_mandir}/man3/crashdump.*
-%{_mandir}/man3/etop.*
-%{_mandir}/man3/observer.*
-%{_mandir}/man3/ttb.*
-%{_mandir}/man6/observer.*
+%{_libdir}/erlang/man/man1/cdv.*
+%{_libdir}/erlang/man/man3/crashdump.*
+%{_libdir}/erlang/man/man3/observer.*
+%{_libdir}/erlang/man/man3/ttb.*
+%{_libdir}/erlang/man/man6/observer.*
 %endif
-%endif # __with_wxwidgets
 
 %files odbc
 %{_libdir}/erlang/lib/odbc-*/
 %if %{with doc}
-%{_mandir}/man3/odbc.*
+%{_libdir}/erlang/man/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}
+%{_libdir}/erlang/man/man3/CosNaming.*
+%{_libdir}/erlang/man/man3/CosNaming_BindingIterator.*
+%{_libdir}/erlang/man/man3/CosNaming_NamingContext.*
+%{_libdir}/erlang/man/man3/CosNaming_NamingContextExt.*
+%{_libdir}/erlang/man/man3/Module_Interface.*
+%{_libdir}/erlang/man/man3/any.*
+%{_libdir}/erlang/man/man3/corba.*
+%{_libdir}/erlang/man/man3/corba_object.*
+%{_libdir}/erlang/man/man3/etop.*
+%{_libdir}/erlang/man/man3/fixed.*
+%{_libdir}/erlang/man/man3/interceptors.*
+%{_libdir}/erlang/man/man3/lname.*
+%{_libdir}/erlang/man/man3/lname_component.*
+%{_libdir}/erlang/man/man3/orber.*
+%{_libdir}/erlang/man/man3/orber_acl.*
+%{_libdir}/erlang/man/man3/orber_diagnostics.*
+%{_libdir}/erlang/man/man3/orber_ifr.*
+%{_libdir}/erlang/man/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_sup.*
-%{_mandir}/man6/os_mon.*
+%{_libdir}/erlang/man/man3/cpu_sup.*
+%{_libdir}/erlang/man/man3/disksup.*
+%{_libdir}/erlang/man/man3/memsup.*
+%{_libdir}/erlang/man/man3/os_mon_mib.*
+%{_libdir}/erlang/man/man3/os_sup.*
+%{_libdir}/erlang/man/man6/os_mon.*
+%endif
+
+%files ose
+%dir %{_libdir}/erlang/lib/ose-*/
+%{_libdir}/erlang/lib/ose-*/ebin/
+%if %{with doc}
+%{_libdir}/erlang/man/man3/ose.*
+%{_libdir}/erlang/man/man3/ose_erl_driver.*
+%{_libdir}/erlang/man/man6/ose.*
+%endif
+
+%files otp_mibs
+%{_libdir}/erlang/lib/otp_mibs-*/
+%if %{with doc}
+%{_libdir}/erlang/man/man3/otp_mib.*
 %endif
 
 %files parsetools
 %{_libdir}/erlang/lib/parsetools-*/
 %if %{with doc}
-%{_mandir}/man3/leex.*
-%{_mandir}/man3/yecc.*
+%{_libdir}/erlang/man/man3/leex.*
+%{_libdir}/erlang/man/man3/yecc.*
+%endif
+
+%files percept
+%{_libdir}/erlang/lib/percept-*/
+%if %{with doc}
+%{_libdir}/erlang/man/man3/egd.*
+%{_libdir}/erlang/man/man3/percept.*
+%{_libdir}/erlang/man/man3/percept_profile.*
 %endif
 
 %files public_key
 %{_libdir}/erlang/lib/public_key-*/
 %if %{with doc}
-%{_mandir}/man3/public_key.*
-%{_mandir}/man6/public_key.*
+%{_libdir}/erlang/man/man3/public_key.*
 %endif
 
-%if %{__with_wxwidgets}
 %files reltool
 %dir %{_libdir}/erlang/lib/reltool-*/
 %{_libdir}/erlang/lib/reltool-*/ebin
 %{_libdir}/erlang/lib/reltool-*/src
 %if %{with doc}
-%{_mandir}/man3/reltool.*
+%{_libdir}/erlang/man/man3/reltool.*
 %endif
-%endif # __with_wxwidgets
 
 %files runtime_tools
 %dir %{_libdir}/erlang/lib/runtime_tools-*/
@@ -1411,12 +1741,11 @@
 %{_libdir}/erlang/lib/runtime_tools-*/include/
 %{_libdir}/erlang/lib/runtime_tools-*/priv/
 %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.*
+%{_libdir}/erlang/man/man3/dbg.*
+%{_libdir}/erlang/man/man3/dyntrace.*
+%{_libdir}/erlang/man/man3/erts_alloc_config.*
+%{_libdir}/erlang/man/man3/system_information.*
+%{_libdir}/erlang/man/man6/runtime_tools.*
 %endif
 
 %files sasl
@@ -1424,15 +1753,16 @@
 %{_libdir}/erlang/lib/sasl-*/ebin
 %{_libdir}/erlang/lib/sasl-*/src
 %if %{with doc}
-%{_mandir}/man3/alarm_handler.*
-%{_mandir}/man3/rb.*
-%{_mandir}/man3/release_handler.*
-%{_mandir}/man3/systools.*
-%{_mandir}/man4/appup.*
-%{_mandir}/man4/rel.*
-%{_mandir}/man4/relup.*
-%{_mandir}/man4/script.*
-%{_mandir}/man6/sasl.*
+%{_libdir}/erlang/man/man3/alarm_handler.*
+%{_libdir}/erlang/man/man3/overload.*
+%{_libdir}/erlang/man/man3/rb.*
+%{_libdir}/erlang/man/man3/release_handler.*
+%{_libdir}/erlang/man/man3/systools.*
+%{_libdir}/erlang/man/man4/appup.*
+%{_libdir}/erlang/man/man4/rel.*
+%{_libdir}/erlang/man/man4/relup.*
+%{_libdir}/erlang/man/man4/script.*
+%{_libdir}/erlang/man/man6/sasl.*
 %endif
 
 %files snmp
@@ -1444,57 +1774,57 @@
 %{_libdir}/erlang/lib/snmp-*/priv
 %{_libdir}/erlang/lib/snmp-*/src
 %if %{with doc}
-%{_mandir}/man1/snmpc.*
-%{_mandir}/man3/snmp.*
-%{_mandir}/man3/snmpa.*
-%{_mandir}/man3/snmpa_conf.*
-%{_mandir}/man3/snmpa_discovery_handler.*
-%{_mandir}/man3/snmpa_error.*
-%{_mandir}/man3/snmpa_error_io.*
-%{_mandir}/man3/snmpa_error_logger.*
-%{_mandir}/man3/snmpa_error_report.*
-%{_mandir}/man3/snmpa_local_db.*
-%{_mandir}/man3/snmpa_mib_data.*
-%{_mandir}/man3/snmpa_mib_storage.*
-%{_mandir}/man3/snmpa_mpd.*
-%{_mandir}/man3/snmpa_network_interface.*
-%{_mandir}/man3/snmpa_network_interface_filter.*
-%{_mandir}/man3/snmpa_notification_delivery_info_receiver.*
-%{_mandir}/man3/snmpa_notification_filter.*
-%{_mandir}/man3/snmpa_supervisor.*
-%{_mandir}/man3/snmpc.*
-%{_mandir}/man3/snmp_community_mib.*
-%{_mandir}/man3/snmp_framework_mib.*
-%{_mandir}/man3/snmp_generic.*
-%{_mandir}/man3/snmp_index.*
-%{_mandir}/man3/snmpm.*
-%{_mandir}/man3/snmpm_conf.*
-%{_mandir}/man3/snmpm_mpd.*
-%{_mandir}/man3/snmpm_network_interface.*
-%{_mandir}/man3/snmpm_network_interface_filter.*
-%{_mandir}/man3/snmpm_user.*
-%{_mandir}/man3/snmp_notification_mib.*
-%{_mandir}/man3/snmp_pdus.*
-%{_mandir}/man3/snmp_standard_mib.*
-%{_mandir}/man3/snmp_target_mib.*
-%{_mandir}/man3/snmp_user_based_sm_mib.*
-%{_mandir}/man3/snmp_view_based_acm_mib.*
-%{_mandir}/man6/snmp.*
-%{_mandir}/man7/INET-ADDRESS-MIB.*
-%{_mandir}/man7/OTP-SNMPEA-MIB.*
-%{_mandir}/man7/RFC1213-MIB.*
-%{_mandir}/man7/SNMP-COMMUNITY-MIB.*
-%{_mandir}/man7/SNMP-FRAMEWORK-MIB.*
-%{_mandir}/man7/SNMP-MPD-MIB.*
-%{_mandir}/man7/SNMP-NOTIFICATION-MIB.*
-%{_mandir}/man7/SNMP-TARGET-MIB.*
-%{_mandir}/man7/SNMP-USER-BASED-SM-MIB.*
-%{_mandir}/man7/SNMP-USM-AES-MIB.*
-%{_mandir}/man7/SNMPv2-MIB.*
-%{_mandir}/man7/SNMPv2-TM.*
-%{_mandir}/man7/SNMP-VIEW-BASED-ACM-MIB.*
-%{_mandir}/man7/STANDARD-MIB.*
-%{_mandir}/man7/TRANSPORT-ADDRESS-MIB.*
+%{_libdir}/erlang/man/man1/snmpc.*
+%{_libdir}/erlang/man/man3/snmp.*
+%{_libdir}/erlang/man/man3/snmpa.*
+%{_libdir}/erlang/man/man3/snmpa_conf.*
+%{_libdir}/erlang/man/man3/snmpa_discovery_handler.*
+%{_libdir}/erlang/man/man3/snmpa_error.*
+%{_libdir}/erlang/man/man3/snmpa_error_io.*
+%{_libdir}/erlang/man/man3/snmpa_error_logger.*
+%{_libdir}/erlang/man/man3/snmpa_error_report.*
+%{_libdir}/erlang/man/man3/snmpa_local_db.*
+%{_libdir}/erlang/man/man3/snmpa_mib_data.*
+%{_libdir}/erlang/man/man3/snmpa_mib_storage.*
+%{_libdir}/erlang/man/man3/snmpa_mpd.*
+%{_libdir}/erlang/man/man3/snmpa_network_interface.*
+%{_libdir}/erlang/man/man3/snmpa_network_interface_filter.*
+%{_libdir}/erlang/man/man3/snmpa_notification_delivery_info_receiver.*
+%{_libdir}/erlang/man/man3/snmpa_notification_filter.*
+%{_libdir}/erlang/man/man3/snmpa_supervisor.*
+%{_libdir}/erlang/man/man3/snmpc.*
+%{_libdir}/erlang/man/man3/snmp_community_mib.*
+%{_libdir}/erlang/man/man3/snmp_framework_mib.*
+%{_libdir}/erlang/man/man3/snmp_generic.*
+%{_libdir}/erlang/man/man3/snmp_index.*
+%{_libdir}/erlang/man/man3/snmpm.*
+%{_libdir}/erlang/man/man3/snmpm_conf.*
+%{_libdir}/erlang/man/man3/snmpm_mpd.*
+%{_libdir}/erlang/man/man3/snmpm_network_interface.*
+%{_libdir}/erlang/man/man3/snmpm_network_interface_filter.*
+%{_libdir}/erlang/man/man3/snmpm_user.*
+%{_libdir}/erlang/man/man3/snmp_notification_mib.*
+%{_libdir}/erlang/man/man3/snmp_pdus.*
+%{_libdir}/erlang/man/man3/snmp_standard_mib.*
+%{_libdir}/erlang/man/man3/snmp_target_mib.*
+%{_libdir}/erlang/man/man3/snmp_user_based_sm_mib.*
+%{_libdir}/erlang/man/man3/snmp_view_based_acm_mib.*
+%{_libdir}/erlang/man/man6/snmp.*
+%{_libdir}/erlang/man/man7/INET-ADDRESS-MIB.*
+%{_libdir}/erlang/man/man7/OTP-SNMPEA-MIB.*
+%{_libdir}/erlang/man/man7/RFC1213-MIB.*
+%{_libdir}/erlang/man/man7/SNMP-COMMUNITY-MIB.*
+%{_libdir}/erlang/man/man7/SNMP-FRAMEWORK-MIB.*
+%{_libdir}/erlang/man/man7/SNMP-MPD-MIB.*
+%{_libdir}/erlang/man/man7/SNMP-NOTIFICATION-MIB.*
+%{_libdir}/erlang/man/man7/SNMP-TARGET-MIB.*
+%{_libdir}/erlang/man/man7/SNMP-USER-BASED-SM-MIB.*
+%{_libdir}/erlang/man/man7/SNMP-USM-AES-MIB.*
+%{_libdir}/erlang/man/man7/SNMPv2-MIB.*
+%{_libdir}/erlang/man/man7/SNMPv2-TM.*
+%{_libdir}/erlang/man/man7/SNMP-VIEW-BASED-ACM-MIB.*
+%{_libdir}/erlang/man/man7/STANDARD-MIB.*
+%{_libdir}/erlang/man/man7/TRANSPORT-ADDRESS-MIB.*
 %endif
 
 %files ssh
@@ -1503,17 +1833,14 @@
 %{_libdir}/erlang/lib/ssh-*/include
 %{_libdir}/erlang/lib/ssh-*/src
 %if %{with doc}
-%{_mandir}/man3/ssh.*
-%{_mandir}/man3/ssh_agent.*
-%{_mandir}/man3/ssh_client_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.*
+%{_libdir}/erlang/man/man3/ssh.*
+%{_libdir}/erlang/man/man3/ssh_channel.*
+%{_libdir}/erlang/man/man3/ssh_client_key_api.*
+%{_libdir}/erlang/man/man3/ssh_connection.*
+%{_libdir}/erlang/man/man3/ssh_server_key_api.*
+%{_libdir}/erlang/man/man3/ssh_sftp.*
+%{_libdir}/erlang/man/man3/ssh_sftpd.*
+%{_libdir}/erlang/man/man6/ssh.*
 %endif
 
 %files ssl
@@ -1521,11 +1848,11 @@
 %{_libdir}/erlang/lib/ssl-*/ebin
 %{_libdir}/erlang/lib/ssl-*/src
 %if %{with doc}
-%{_mandir}/man3/ssl.*
-%{_mandir}/man3/ssl_crl_cache.*
-%{_mandir}/man3/ssl_crl_cache_api.*
-%{_mandir}/man3/ssl_session_cache_api.*
-%{_mandir}/man6/ssl.*
+%{_libdir}/erlang/man/man3/ssl.*
+%{_libdir}/erlang/man/man3/ssl_crl_cache.*
+%{_libdir}/erlang/man/man3/ssl_crl_cache_api.*
+%{_libdir}/erlang/man/man3/ssl_session_cache_api.*
+%{_libdir}/erlang/man/man6/ssl.*
 %endif
 
 %files stdlib
@@ -1534,72 +1861,67 @@
 %{_libdir}/erlang/lib/stdlib-*/include
 %{_libdir}/erlang/lib/stdlib-*/src
 %if %{with doc}
-%{_mandir}/man3/array.*
-%{_mandir}/man3/base64.*
-%{_mandir}/man3/beam_lib.*
-%{_mandir}/man3/binary.*
-%{_mandir}/man3/c.*
-%{_mandir}/man3/calendar.*
-%{_mandir}/man3/dets.*
-%{_mandir}/man3/dict.*
-%{_mandir}/man3/digraph.*
-%{_mandir}/man3/digraph_utils.*
-%{_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.*
-%{_mandir}/man3/erl_parse.*
-%{_mandir}/man3/erl_pp.*
-%{_mandir}/man3/erl_scan.*
-%{_mandir}/man3/erl_tar.*
-%{_mandir}/man3/ets.*
-%{_mandir}/man3/file_sorter.*
-%{_mandir}/man3/filelib.*
-%{_mandir}/man3/filename.*
-%{_mandir}/man3/gb_sets.*
-%{_mandir}/man3/gb_trees.*
-%{_mandir}/man3/gen_event.*
-%{_mandir}/man3/gen_fsm.*
-%{_mandir}/man3/gen_server.*
-%{_mandir}/man3/gen_statem.*
-%{_mandir}/man3/io.*
-%{_mandir}/man3/io_lib.*
-%{_mandir}/man3/lists.*
-%{_mandir}/man3/log_mf_h.*
-%{_mandir}/man3/maps.*
-%{_mandir}/man3/math.*
-%{_mandir}/man3/ms_transform.*
-%{_mandir}/man3/orddict.*
-%{_mandir}/man3/ordsets.*
-%{_mandir}/man3/peer.*
-%{_mandir}/man3/pool.*
-%{_mandir}/man3/proc_lib.*
-%{_mandir}/man3/proplists.*
-%{_mandir}/man3/qlc.*
-%{_mandir}/man3/queue.*
-%{_mandir}/man3/rand.*
-%{_mandir}/man3/random.*
-%{_mandir}/man3/re.*
-%{_mandir}/man3/sets.*
-%{_mandir}/man3/shell.*
-%{_mandir}/man3/shell_default.*
-%{_mandir}/man3/shell_docs.*
-%{_mandir}/man3/slave.*
-%{_mandir}/man3/sofs.*
-%{_mandir}/man3/string.*
-%{_mandir}/man3/supervisor.*
-%{_mandir}/man3/supervisor_bridge.*
-%{_mandir}/man3/sys.*
-%{_mandir}/man3/timer.*
-%{_mandir}/man3/unicode.*
-%{_mandir}/man3/uri_string.*
-%{_mandir}/man3/zip.*
-%{_mandir}/man6/stdlib.*
+%{_libdir}/erlang/man/man3/array.*
+%{_libdir}/erlang/man/man3/base64.*
+%{_libdir}/erlang/man/man3/beam_lib.*
+%{_libdir}/erlang/man/man3/binary.*
+%{_libdir}/erlang/man/man3/c.*
+%{_libdir}/erlang/man/man3/calendar.*
+%{_libdir}/erlang/man/man3/dets.*
+%{_libdir}/erlang/man/man3/dict.*
+%{_libdir}/erlang/man/man3/digraph.*
+%{_libdir}/erlang/man/man3/digraph_utils.*
+%{_libdir}/erlang/man/man3/epp.*
+%{_libdir}/erlang/man/man3/erl_anno.*
+%{_libdir}/erlang/man/man3/erl_eval.*
+%{_libdir}/erlang/man/man3/erl_expand_records.*
+%{_libdir}/erlang/man/man3/erl_id_trans.*
+%{_libdir}/erlang/man/man3/erl_internal.*
+%{_libdir}/erlang/man/man3/erl_lint.*
+%{_libdir}/erlang/man/man3/erl_parse.*
+%{_libdir}/erlang/man/man3/erl_pp.*
+%{_libdir}/erlang/man/man3/erl_scan.*
+%{_libdir}/erlang/man/man3/erl_tar.*
+%{_libdir}/erlang/man/man3/ets.*
+%{_libdir}/erlang/man/man3/file_sorter.*
+%{_libdir}/erlang/man/man3/filelib.*
+%{_libdir}/erlang/man/man3/filename.*
+%{_libdir}/erlang/man/man3/gb_sets.*
+%{_libdir}/erlang/man/man3/gb_trees.*
+%{_libdir}/erlang/man/man3/gen_event.*
+%{_libdir}/erlang/man/man3/gen_fsm.*
+%{_libdir}/erlang/man/man3/gen_server.*
+%{_libdir}/erlang/man/man3/io.*
+%{_libdir}/erlang/man/man3/io_lib.*
+%{_libdir}/erlang/man/man3/lib.*
+%{_libdir}/erlang/man/man3/lists.*
+%{_libdir}/erlang/man/man3/log_mf_h.*
+%{_libdir}/erlang/man/man3/maps.*
+%{_libdir}/erlang/man/man3/math.*
+%{_libdir}/erlang/man/man3/ms_transform.*
+%{_libdir}/erlang/man/man3/orddict.*
+%{_libdir}/erlang/man/man3/ordsets.*
+%{_libdir}/erlang/man/man3/pool.*
+%{_libdir}/erlang/man/man3/proc_lib.*
+%{_libdir}/erlang/man/man3/proplists.*
+%{_libdir}/erlang/man/man3/qlc.*
+%{_libdir}/erlang/man/man3/queue.*
+%{_libdir}/erlang/man/man3/rand.*
+%{_libdir}/erlang/man/man3/random.*
+%{_libdir}/erlang/man/man3/re.*
+%{_libdir}/erlang/man/man3/sets.*
+%{_libdir}/erlang/man/man3/shell.*
+%{_libdir}/erlang/man/man3/shell_default.*
+%{_libdir}/erlang/man/man3/slave.*
+%{_libdir}/erlang/man/man3/sofs.*
+%{_libdir}/erlang/man/man3/string.*
+%{_libdir}/erlang/man/man3/supervisor.*
+%{_libdir}/erlang/man/man3/supervisor_bridge.*
+%{_libdir}/erlang/man/man3/sys.*
+%{_libdir}/erlang/man/man3/timer.*
+%{_libdir}/erlang/man/man3/unicode.*
+%{_libdir}/erlang/man/man3/zip.*
+%{_libdir}/erlang/man/man6/stdlib.*
 %endif
 
 %files syntax_tools
@@ -1607,52 +1929,61 @@
 %{_libdir}/erlang/lib/syntax_tools-*/ebin
 %{_libdir}/erlang/lib/syntax_tools-*/include
 %if %{with doc}
-%{_mandir}/man3/epp_dodger.*
-%{_mandir}/man3/erl_comment_scan.*
-%{_mandir}/man3/erl_prettypr.*
-%{_mandir}/man3/erl_recomment.*
-%{_mandir}/man3/erl_syntax.*
-%{_mandir}/man3/erl_syntax_lib.*
-%{_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.*
+%{_libdir}/erlang/man/man3/epp_dodger.*
+%{_libdir}/erlang/man/man3/erl_comment_scan.*
+%{_libdir}/erlang/man/man3/erl_prettypr.*
+%{_libdir}/erlang/man/man3/erl_recomment.*
+%{_libdir}/erlang/man/man3/erl_syntax.*
+%{_libdir}/erlang/man/man3/erl_syntax_lib.*
+%{_libdir}/erlang/man/man3/erl_tidy.*
+%{_libdir}/erlang/man/man3/igor.*
+%{_libdir}/erlang/man/man3/merl.*
+%{_libdir}/erlang/man/man3/merl_transform.*
+%{_libdir}/erlang/man/man3/prettypr.*
+%endif
+
+%files test_server
+%{_libdir}/erlang/lib/test_server-*/
+%if %{with doc}
+%{_libdir}/erlang/man/man3/test_server.*
+%{_libdir}/erlang/man/man3/test_server_ctrl.*
+%{_libdir}/erlang/man/man6/test_server.*
 %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
+%{_libdir}/erlang/lib/tools-*/src
 %if %{with doc}
-%{_mandir}/man3/cover.*
-%{_mandir}/man3/cprof.*
-%{_mandir}/man3/eprof.*
-%{_mandir}/man3/erlang_mode.*
-%{_mandir}/man3/fprof.*
-%{_mandir}/man3/instrument.*
-%{_mandir}/man3/lcnt.*
-%{_mandir}/man3/make.*
-%{_mandir}/man3/tags.*
-%{_mandir}/man3/xref.*
+%{_libdir}/erlang/man/man3/cover.*
+%{_libdir}/erlang/man/man3/cprof.*
+%{_libdir}/erlang/man/man3/eprof.*
+%{_libdir}/erlang/man/man3/erlang_mode.*
+%{_libdir}/erlang/man/man3/fprof.*
+%{_libdir}/erlang/man/man3/instrument.*
+%{_libdir}/erlang/man/man3/lcnt.*
+%{_libdir}/erlang/man/man3/make.*
+%{_libdir}/erlang/man/man3/tags.*
+%{_libdir}/erlang/man/man3/xref.*
+%endif
+
+%files typer
+%{_bindir}/typer
+%{_libdir}/erlang/bin/typer
+%{_libdir}/erlang/erts-*/bin/typer
+%dir %{_libdir}/erlang/lib/typer-*/
+%{_libdir}/erlang/lib/typer-*/ebin/
+
+%files webtool
+%{_libdir}/erlang/lib/webtool-*/
+%if %{with doc}
+%{_libdir}/erlang/man/man1/start_webtool.*
+%{_libdir}/erlang/man/man3/webtool.*
 %endif
-%if %{__with_emacs}
-%dir %{_emacs_sitelispdir}/erlang
-%doc %{_emacs_sitelispdir}/erlang/README
-%{_emacs_sitelispdir}/erlang/*.el
-%{_emacs_sitelispdir}/erlang/*.elc
-%{_emacs_sitestartdir}/erlang-init.el
-%endif %{__with_emacs}
 
-%if %{__with_wxwidgets}
 %files wx
 %dir %{_libdir}/erlang/lib/wx-*/
 %{_libdir}/erlang/lib/wx-*/ebin
@@ -1660,798 +1991,269 @@
 %{_libdir}/erlang/lib/wx-*/priv
 %{_libdir}/erlang/lib/wx-*/src
 %if %{with doc}
-%{_mandir}/man3/gl.*
-%{_mandir}/man3/glu.*
-%{_mandir}/man3/wx.*
-%{_mandir}/man3/wxAcceleratorEntry.*
-%{_mandir}/man3/wxAcceleratorTable.*
-%{_mandir}/man3/wxActivateEvent.*
-%{_mandir}/man3/wxArtProvider.*
-%{_mandir}/man3/wxAuiDockArt.*
-%{_mandir}/man3/wxAuiManager.*
-%{_mandir}/man3/wxAuiManagerEvent.*
-%{_mandir}/man3/wxAuiNotebook.*
-%{_mandir}/man3/wxAuiNotebookEvent.*
-%{_mandir}/man3/wxAuiPaneInfo.*
-%{_mandir}/man3/wxAuiSimpleTabArt.*
-%{_mandir}/man3/wxAuiTabArt.*
-%{_mandir}/man3/wxBitmap.*
-%{_mandir}/man3/wxBitmapButton.*
-%{_mandir}/man3/wxBitmapDataObject.*
-%{_mandir}/man3/wxBookCtrlBase.*
-%{_mandir}/man3/wxBookCtrlEvent.*
-%{_mandir}/man3/wxBoxSizer.*
-%{_mandir}/man3/wxBrush.*
-%{_mandir}/man3/wxBufferedDC.*
-%{_mandir}/man3/wxBufferedPaintDC.*
-%{_mandir}/man3/wxButton.*
-%{_mandir}/man3/wxCalendarCtrl.*
-%{_mandir}/man3/wxCalendarDateAttr.*
-%{_mandir}/man3/wxCalendarEvent.*
-%{_mandir}/man3/wxCaret.*
-%{_mandir}/man3/wxCheckBox.*
-%{_mandir}/man3/wxCheckListBox.*
-%{_mandir}/man3/wxChildFocusEvent.*
-%{_mandir}/man3/wxChoice.*
-%{_mandir}/man3/wxChoicebook.*
-%{_mandir}/man3/wxClientDC.*
-%{_mandir}/man3/wxClipboard.*
-%{_mandir}/man3/wxClipboardTextEvent.*
-%{_mandir}/man3/wxCloseEvent.*
-%{_mandir}/man3/wxColourData.*
-%{_mandir}/man3/wxColourDialog.*
-%{_mandir}/man3/wxColourPickerCtrl.*
-%{_mandir}/man3/wxColourPickerEvent.*
-%{_mandir}/man3/wxComboBox.*
-%{_mandir}/man3/wxCommandEvent.*
-%{_mandir}/man3/wxContextMenuEvent.*
-%{_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/wxDialog.*
-%{_mandir}/man3/wxDirDialog.*
-%{_mandir}/man3/wxDirPickerCtrl.*
-%{_mandir}/man3/wxDisplay.*
-%{_mandir}/man3/wxDisplayChangedEvent.*
-%{_mandir}/man3/wxDropFilesEvent.*
-%{_mandir}/man3/wxEraseEvent.*
-%{_mandir}/man3/wxEvent.*
-%{_mandir}/man3/wxEvtHandler.*
-%{_mandir}/man3/wxFileDataObject.*
-%{_mandir}/man3/wxFileDialog.*
-%{_mandir}/man3/wxFileDirPickerEvent.*
-%{_mandir}/man3/wxFilePickerCtrl.*
-%{_mandir}/man3/wxFindReplaceData.*
-%{_mandir}/man3/wxFindReplaceDialog.*
-%{_mandir}/man3/wxFlexGridSizer.*
-%{_mandir}/man3/wxFocusEvent.*
-%{_mandir}/man3/wxFont.*
-%{_mandir}/man3/wxFontData.*
-%{_mandir}/man3/wxFontDialog.*
-%{_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/wxGenericDirCtrl.*
-%{_mandir}/man3/wxGraphicsBrush.*
-%{_mandir}/man3/wxGraphicsContext.*
-%{_mandir}/man3/wxGraphicsFont.*
-%{_mandir}/man3/wxGraphicsGradientStops.*
-%{_mandir}/man3/wxGraphicsMatrix.*
-%{_mandir}/man3/wxGraphicsObject.*
-%{_mandir}/man3/wxGraphicsPath.*
-%{_mandir}/man3/wxGraphicsPen.*
-%{_mandir}/man3/wxGraphicsRenderer.*
-%{_mandir}/man3/wxGrid.*
-%{_mandir}/man3/wxGridBagSizer.*
-%{_mandir}/man3/wxGridCellAttr.*
-%{_mandir}/man3/wxGridCellBoolEditor.*
-%{_mandir}/man3/wxGridCellBoolRenderer.*
-%{_mandir}/man3/wxGridCellChoiceEditor.*
-%{_mandir}/man3/wxGridCellEditor.*
-%{_mandir}/man3/wxGridCellFloatEditor.*
-%{_mandir}/man3/wxGridCellFloatRenderer.*
-%{_mandir}/man3/wxGridCellNumberEditor.*
-%{_mandir}/man3/wxGridCellNumberRenderer.*
-%{_mandir}/man3/wxGridCellRenderer.*
-%{_mandir}/man3/wxGridCellStringRenderer.*
-%{_mandir}/man3/wxGridCellTextEditor.*
-%{_mandir}/man3/wxGridEvent.*
-%{_mandir}/man3/wxGridSizer.*
-%{_mandir}/man3/wxHelpEvent.*
-%{_mandir}/man3/wxHtmlEasyPrinting.*
-%{_mandir}/man3/wxHtmlLinkEvent.*
-%{_mandir}/man3/wxHtmlWindow.*
-%{_mandir}/man3/wxIcon.*
-%{_mandir}/man3/wxIconBundle.*
-%{_mandir}/man3/wxIconizeEvent.*
-%{_mandir}/man3/wxIdleEvent.*
-%{_mandir}/man3/wxImage.*
-%{_mandir}/man3/wxImageList.*
-%{_mandir}/man3/wxInitDialogEvent.*
-%{_mandir}/man3/wxJoystickEvent.*
-%{_mandir}/man3/wxKeyEvent.*
-%{_mandir}/man3/wxLayoutAlgorithm.*
-%{_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/wxMDIChildFrame.*
-%{_mandir}/man3/wxMDIClientWindow.*
-%{_mandir}/man3/wxMDIParentFrame.*
-%{_mandir}/man3/wxMask.*
-%{_mandir}/man3/wxMaximizeEvent.*
-%{_mandir}/man3/wxMemoryDC.*
-%{_mandir}/man3/wxMenu.*
-%{_mandir}/man3/wxMenuBar.*
-%{_mandir}/man3/wxMenuEvent.*
-%{_mandir}/man3/wxMenuItem.*
-%{_mandir}/man3/wxMessageDialog.*
-%{_mandir}/man3/wxMiniFrame.*
-%{_mandir}/man3/wxMirrorDC.*
-%{_mandir}/man3/wxMouseCaptureChangedEvent.*
-%{_mandir}/man3/wxMouseCaptureLostEvent.*
-%{_mandir}/man3/wxMouseEvent.*
-%{_mandir}/man3/wxMoveEvent.*
-%{_mandir}/man3/wxMultiChoiceDialog.*
-%{_mandir}/man3/wxNavigationKeyEvent.*
-%{_mandir}/man3/wxNotebook.*
-%{_mandir}/man3/wxNotificationMessage.*
-%{_mandir}/man3/wxNotifyEvent.*
-%{_mandir}/man3/wxOverlay.*
-%{_mandir}/man3/wxPageSetupDialog.*
-%{_mandir}/man3/wxPageSetupDialogData.*
-%{_mandir}/man3/wxPaintDC.*
-%{_mandir}/man3/wxPaintEvent.*
-%{_mandir}/man3/wxPalette.*
-%{_mandir}/man3/wxPaletteChangedEvent.*
-%{_mandir}/man3/wxPanel.*
-%{_mandir}/man3/wxPasswordEntryDialog.*
-%{_mandir}/man3/wxPen.*
-%{_mandir}/man3/wxPickerBase.*
-%{_mandir}/man3/wxPopupTransientWindow.*
-%{_mandir}/man3/wxPopupWindow.*
-%{_mandir}/man3/wxPostScriptDC.*
-%{_mandir}/man3/wxPreviewCanvas.*
-%{_mandir}/man3/wxPreviewControlBar.*
-%{_mandir}/man3/wxPreviewFrame.*
-%{_mandir}/man3/wxPrintData.*
-%{_mandir}/man3/wxPrintDialog.*
-%{_mandir}/man3/wxPrintDialogData.*
-%{_mandir}/man3/wxPrintPreview.*
-%{_mandir}/man3/wxPrinter.*
-%{_mandir}/man3/wxPrintout.*
-%{_mandir}/man3/wxProgressDialog.*
-%{_mandir}/man3/wxQueryNewPaletteEvent.*
-%{_mandir}/man3/wxRadioBox.*
-%{_mandir}/man3/wxRadioButton.*
-%{_mandir}/man3/wxRegion.*
-%{_mandir}/man3/wxSashEvent.*
-%{_mandir}/man3/wxSashLayoutWindow.*
-%{_mandir}/man3/wxSashWindow.*
-%{_mandir}/man3/wxScreenDC.*
-%{_mandir}/man3/wxScrollBar.*
-%{_mandir}/man3/wxScrollEvent.*
-%{_mandir}/man3/wxScrollWinEvent.*
-%{_mandir}/man3/wxScrolledWindow.*
-%{_mandir}/man3/wxSetCursorEvent.*
-%{_mandir}/man3/wxShowEvent.*
-%{_mandir}/man3/wxSingleChoiceDialog.*
-%{_mandir}/man3/wxSizeEvent.*
-%{_mandir}/man3/wxSizer.*
-%{_mandir}/man3/wxSizerFlags.*
-%{_mandir}/man3/wxSizerItem.*
-%{_mandir}/man3/wxSlider.*
-%{_mandir}/man3/wxSpinButton.*
-%{_mandir}/man3/wxSpinCtrl.*
-%{_mandir}/man3/wxSpinEvent.*
-%{_mandir}/man3/wxSplashScreen.*
-%{_mandir}/man3/wxSplitterEvent.*
-%{_mandir}/man3/wxSplitterWindow.*
-%{_mandir}/man3/wxStaticBitmap.*
-%{_mandir}/man3/wxStaticBox.*
-%{_mandir}/man3/wxStaticBoxSizer.*
-%{_mandir}/man3/wxStaticLine.*
-%{_mandir}/man3/wxStaticText.*
-%{_mandir}/man3/wxStatusBar.*
-%{_mandir}/man3/wxStdDialogButtonSizer.*
-%{_mandir}/man3/wxStyledTextCtrl.*
-%{_mandir}/man3/wxStyledTextEvent.*
-%{_mandir}/man3/wxSysColourChangedEvent.*
-%{_mandir}/man3/wxSystemOptions.*
-%{_mandir}/man3/wxSystemSettings.*
-%{_mandir}/man3/wxTaskBarIcon.*
-%{_mandir}/man3/wxTaskBarIconEvent.*
-%{_mandir}/man3/wxTextAttr.*
-%{_mandir}/man3/wxTextCtrl.*
-%{_mandir}/man3/wxTextDataObject.*
-%{_mandir}/man3/wxTextEntryDialog.*
-%{_mandir}/man3/wxToggleButton.*
-%{_mandir}/man3/wxToolBar.*
-%{_mandir}/man3/wxToolTip.*
-%{_mandir}/man3/wxToolbook.*
-%{_mandir}/man3/wxTopLevelWindow.*
-%{_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.*
+%{_libdir}/erlang/man/man3/gl.*
+%{_libdir}/erlang/man/man3/glu.*
+%{_libdir}/erlang/man/man3/wx.*
+%{_libdir}/erlang/man/man3/wx_misc.*
+%{_libdir}/erlang/man/man3/wx_object.*
+%{_libdir}/erlang/man/man3/wxAcceleratorEntry.*
+%{_libdir}/erlang/man/man3/wxAcceleratorTable.*
+%{_libdir}/erlang/man/man3/wxActivateEvent.*
+%{_libdir}/erlang/man/man3/wxArtProvider.*
+%{_libdir}/erlang/man/man3/wxAuiDockArt.*
+%{_libdir}/erlang/man/man3/wxAuiManager.*
+%{_libdir}/erlang/man/man3/wxAuiManagerEvent.*
+%{_libdir}/erlang/man/man3/wxAuiNotebook.*
+%{_libdir}/erlang/man/man3/wxAuiNotebookEvent.*
+%{_libdir}/erlang/man/man3/wxAuiPaneInfo.*
+%{_libdir}/erlang/man/man3/wxAuiSimpleTabArt.*
+%{_libdir}/erlang/man/man3/wxAuiTabArt.*
+%{_libdir}/erlang/man/man3/wxBitmap.*
+%{_libdir}/erlang/man/man3/wxBitmapButton.*
+%{_libdir}/erlang/man/man3/wxBitmapDataObject.*
+%{_libdir}/erlang/man/man3/wxBoxSizer.*
+%{_libdir}/erlang/man/man3/wxBrush.*
+%{_libdir}/erlang/man/man3/wxBufferedDC.*
+%{_libdir}/erlang/man/man3/wxBufferedPaintDC.*
+%{_libdir}/erlang/man/man3/wxButton.*
+%{_libdir}/erlang/man/man3/wxCalendarCtrl.*
+%{_libdir}/erlang/man/man3/wxCalendarDateAttr.*
+%{_libdir}/erlang/man/man3/wxCalendarEvent.*
+%{_libdir}/erlang/man/man3/wxCaret.*
+%{_libdir}/erlang/man/man3/wxCheckBox.*
+%{_libdir}/erlang/man/man3/wxCheckListBox.*
+%{_libdir}/erlang/man/man3/wxChildFocusEvent.*
+%{_libdir}/erlang/man/man3/wxChoice.*
+%{_libdir}/erlang/man/man3/wxChoicebook.*
+%{_libdir}/erlang/man/man3/wxClientDC.*
+%{_libdir}/erlang/man/man3/wxClipboard.*
+%{_libdir}/erlang/man/man3/wxClipboardTextEvent.*
+%{_libdir}/erlang/man/man3/wxCloseEvent.*
+%{_libdir}/erlang/man/man3/wxColourData.*
+%{_libdir}/erlang/man/man3/wxColourDialog.*
+%{_libdir}/erlang/man/man3/wxColourPickerCtrl.*
+%{_libdir}/erlang/man/man3/wxColourPickerEvent.*
+%{_libdir}/erlang/man/man3/wxComboBox.*
+%{_libdir}/erlang/man/man3/wxCommandEvent.*
+%{_libdir}/erlang/man/man3/wxContextMenuEvent.*
+%{_libdir}/erlang/man/man3/wxControl.*
+%{_libdir}/erlang/man/man3/wxControlWithItems.*
+%{_libdir}/erlang/man/man3/wxCursor.*
+%{_libdir}/erlang/man/man3/wxDataObject.*
+%{_libdir}/erlang/man/man3/wxDateEvent.*
+%{_libdir}/erlang/man/man3/wxDatePickerCtrl.*
+%{_libdir}/erlang/man/man3/wxDC.*
+%{_libdir}/erlang/man/man3/wxDCOverlay.*
+%{_libdir}/erlang/man/man3/wxDialog.*
+%{_libdir}/erlang/man/man3/wxDirDialog.*
+%{_libdir}/erlang/man/man3/wxDirPickerCtrl.*
+%{_libdir}/erlang/man/man3/wxDisplayChangedEvent.*
+%{_libdir}/erlang/man/man3/wxEraseEvent.*
+%{_libdir}/erlang/man/man3/wxEvent.*
+%{_libdir}/erlang/man/man3/wxEvtHandler.*
+%{_libdir}/erlang/man/man3/wxFileDataObject.*
+%{_libdir}/erlang/man/man3/wxFileDialog.*
+%{_libdir}/erlang/man/man3/wxFileDirPickerEvent.*
+%{_libdir}/erlang/man/man3/wxFilePickerCtrl.*
+%{_libdir}/erlang/man/man3/wxFindReplaceData.*
+%{_libdir}/erlang/man/man3/wxFindReplaceDialog.*
+%{_libdir}/erlang/man/man3/wxFlexGridSizer.*
+%{_libdir}/erlang/man/man3/wxFocusEvent.*
+%{_libdir}/erlang/man/man3/wxFont.*
+%{_libdir}/erlang/man/man3/wxFontData.*
+%{_libdir}/erlang/man/man3/wxFontDialog.*
+%{_libdir}/erlang/man/man3/wxFontPickerCtrl.*
+%{_libdir}/erlang/man/man3/wxFontPickerEvent.*
+%{_libdir}/erlang/man/man3/wxFrame.*
+%{_libdir}/erlang/man/man3/wxGauge.*
+%{_libdir}/erlang/man/man3/wxGBSizerItem.*
+%{_libdir}/erlang/man/man3/wxGenericDirCtrl.*
+%{_libdir}/erlang/man/man3/wxGLCanvas.*
+%{_libdir}/erlang/man/man3/wxGraphicsBrush.*
+%{_libdir}/erlang/man/man3/wxGraphicsContext.*
+%{_libdir}/erlang/man/man3/wxGraphicsFont.*
+%{_libdir}/erlang/man/man3/wxGraphicsMatrix.*
+%{_libdir}/erlang/man/man3/wxGraphicsObject.*
+%{_libdir}/erlang/man/man3/wxGraphicsPath.*
+%{_libdir}/erlang/man/man3/wxGraphicsPen.*
+%{_libdir}/erlang/man/man3/wxGraphicsRenderer.*
+%{_libdir}/erlang/man/man3/wxGrid.*
+%{_libdir}/erlang/man/man3/wxGridBagSizer.*
+%{_libdir}/erlang/man/man3/wxGridCellAttr.*
+%{_libdir}/erlang/man/man3/wxGridCellBoolEditor.*
+%{_libdir}/erlang/man/man3/wxGridCellBoolRenderer.*
+%{_libdir}/erlang/man/man3/wxGridCellChoiceEditor.*
+%{_libdir}/erlang/man/man3/wxGridCellEditor.*
+%{_libdir}/erlang/man/man3/wxGridCellFloatEditor.*
+%{_libdir}/erlang/man/man3/wxGridCellFloatRenderer.*
+%{_libdir}/erlang/man/man3/wxGridCellNumberEditor.*
+%{_libdir}/erlang/man/man3/wxGridCellNumberRenderer.*
+%{_libdir}/erlang/man/man3/wxGridCellRenderer.*
+%{_libdir}/erlang/man/man3/wxGridCellStringRenderer.*
+%{_libdir}/erlang/man/man3/wxGridCellTextEditor.*
+%{_libdir}/erlang/man/man3/wxGridEvent.*
+%{_libdir}/erlang/man/man3/wxGridSizer.*
+%{_libdir}/erlang/man/man3/wxHelpEvent.*
+%{_libdir}/erlang/man/man3/wxHtmlEasyPrinting.*
+%{_libdir}/erlang/man/man3/wxHtmlLinkEvent.*
+%{_libdir}/erlang/man/man3/wxHtmlWindow.*
+%{_libdir}/erlang/man/man3/wxIcon.*
+%{_libdir}/erlang/man/man3/wxIconBundle.*
+%{_libdir}/erlang/man/man3/wxIconizeEvent.*
+%{_libdir}/erlang/man/man3/wxIdleEvent.*
+%{_libdir}/erlang/man/man3/wxImage.*
+%{_libdir}/erlang/man/man3/wxImageList.*
+%{_libdir}/erlang/man/man3/wxInitDialogEvent.*
+%{_libdir}/erlang/man/man3/wxJoystickEvent.*
+%{_libdir}/erlang/man/man3/wxKeyEvent.*
+%{_libdir}/erlang/man/man3/wxLayoutAlgorithm.*
+%{_libdir}/erlang/man/man3/wxListbook.*
+%{_libdir}/erlang/man/man3/wxListBox.*
+%{_libdir}/erlang/man/man3/wxListCtrl.*
+%{_libdir}/erlang/man/man3/wxListEvent.*
+%{_libdir}/erlang/man/man3/wxListItem.*
+%{_libdir}/erlang/man/man3/wxListItemAttr.*
+%{_libdir}/erlang/man/man3/wxListView.*
+%{_libdir}/erlang/man/man3/wxLocale.*
+%{_libdir}/erlang/man/man3/wxLogNull.*
+%{_libdir}/erlang/man/man3/wxMask.*
+%{_libdir}/erlang/man/man3/wxMaximizeEvent.*
+%{_libdir}/erlang/man/man3/wxMDIChildFrame.*
+%{_libdir}/erlang/man/man3/wxMDIClientWindow.*
+%{_libdir}/erlang/man/man3/wxMDIParentFrame.*
+%{_libdir}/erlang/man/man3/wxMemoryDC.*
+%{_libdir}/erlang/man/man3/wxMenu.*
+%{_libdir}/erlang/man/man3/wxMenuBar.*
+%{_libdir}/erlang/man/man3/wxMenuEvent.*
+%{_libdir}/erlang/man/man3/wxMenuItem.*
+%{_libdir}/erlang/man/man3/wxMessageDialog.*
+%{_libdir}/erlang/man/man3/wxMiniFrame.*
+%{_libdir}/erlang/man/man3/wxMirrorDC.*
+%{_libdir}/erlang/man/man3/wxMouseCaptureChangedEvent.*
+%{_libdir}/erlang/man/man3/wxMouseCaptureLostEvent.*
+%{_libdir}/erlang/man/man3/wxMouseEvent.*
+%{_libdir}/erlang/man/man3/wxMoveEvent.*
+%{_libdir}/erlang/man/man3/wxMultiChoiceDialog.*
+%{_libdir}/erlang/man/man3/wxNavigationKeyEvent.*
+%{_libdir}/erlang/man/man3/wxNotebook.*
+%{_libdir}/erlang/man/man3/wxNotebookEvent.*
+%{_libdir}/erlang/man/man3/wxNotifyEvent.*
+%{_libdir}/erlang/man/man3/wxOverlay.*
+%{_libdir}/erlang/man/man3/wxPageSetupDialog.*
+%{_libdir}/erlang/man/man3/wxPageSetupDialogData.*
+%{_libdir}/erlang/man/man3/wxPaintDC.*
+%{_libdir}/erlang/man/man3/wxPaintEvent.*
+%{_libdir}/erlang/man/man3/wxPalette.*
+%{_libdir}/erlang/man/man3/wxPaletteChangedEvent.*
+%{_libdir}/erlang/man/man3/wxPanel.*
+%{_libdir}/erlang/man/man3/wxPasswordEntryDialog.*
+%{_libdir}/erlang/man/man3/wxPen.*
+%{_libdir}/erlang/man/man3/wxPickerBase.*
+%{_libdir}/erlang/man/man3/wxPopupTransientWindow.*
+%{_libdir}/erlang/man/man3/wxPopupWindow.*
+%{_libdir}/erlang/man/man3/wxPostScriptDC.*
+%{_libdir}/erlang/man/man3/wxPreviewCanvas.*
+%{_libdir}/erlang/man/man3/wxPreviewControlBar.*
+%{_libdir}/erlang/man/man3/wxPreviewFrame.*
+%{_libdir}/erlang/man/man3/wxPrintData.*
+%{_libdir}/erlang/man/man3/wxPrintDialog.*
+%{_libdir}/erlang/man/man3/wxPrintDialogData.*
+%{_libdir}/erlang/man/man3/wxPrinter.*
+%{_libdir}/erlang/man/man3/wxPrintout.*
+%{_libdir}/erlang/man/man3/wxPrintPreview.*
+%{_libdir}/erlang/man/man3/wxProgressDialog.*
+%{_libdir}/erlang/man/man3/wxQueryNewPaletteEvent.*
+%{_libdir}/erlang/man/man3/wxRadioBox.*
+%{_libdir}/erlang/man/man3/wxRadioButton.*
+%{_libdir}/erlang/man/man3/wxRegion.*
+%{_libdir}/erlang/man/man3/wxSashEvent.*
+%{_libdir}/erlang/man/man3/wxSashLayoutWindow.*
+%{_libdir}/erlang/man/man3/wxSashWindow.*
+%{_libdir}/erlang/man/man3/wxScreenDC.*
+%{_libdir}/erlang/man/man3/wxScrollBar.*
+%{_libdir}/erlang/man/man3/wxScrolledWindow.*
+%{_libdir}/erlang/man/man3/wxScrollEvent.*
+%{_libdir}/erlang/man/man3/wxScrollWinEvent.*
+%{_libdir}/erlang/man/man3/wxSetCursorEvent.*
+%{_libdir}/erlang/man/man3/wxShowEvent.*
+%{_libdir}/erlang/man/man3/wxSingleChoiceDialog.*
+%{_libdir}/erlang/man/man3/wxSizeEvent.*
+%{_libdir}/erlang/man/man3/wxSizer.*
+%{_libdir}/erlang/man/man3/wxSizerFlags.*
+%{_libdir}/erlang/man/man3/wxSizerItem.*
+%{_libdir}/erlang/man/man3/wxSlider.*
+%{_libdir}/erlang/man/man3/wxSpinButton.*
+%{_libdir}/erlang/man/man3/wxSpinCtrl.*
+%{_libdir}/erlang/man/man3/wxSpinEvent.*
+%{_libdir}/erlang/man/man3/wxSplashScreen.*
+%{_libdir}/erlang/man/man3/wxSplitterEvent.*
+%{_libdir}/erlang/man/man3/wxSplitterWindow.*
+%{_libdir}/erlang/man/man3/wxStaticBitmap.*
+%{_libdir}/erlang/man/man3/wxStaticBox.*
+%{_libdir}/erlang/man/man3/wxStaticBoxSizer.*
+%{_libdir}/erlang/man/man3/wxStaticLine.*
+%{_libdir}/erlang/man/man3/wxStaticText.*
+%{_libdir}/erlang/man/man3/wxStatusBar.*
+%{_libdir}/erlang/man/man3/wxStdDialogButtonSizer.*
+%{_libdir}/erlang/man/man3/wxStyledTextCtrl.*
+%{_libdir}/erlang/man/man3/wxStyledTextEvent.*
+%{_libdir}/erlang/man/man3/wxSysColourChangedEvent.*
+%{_libdir}/erlang/man/man3/wxSystemOptions.*
+%{_libdir}/erlang/man/man3/wxSystemSettings.*
+%{_libdir}/erlang/man/man3/wxTaskBarIcon.*
+%{_libdir}/erlang/man/man3/wxTaskBarIconEvent.*
+%{_libdir}/erlang/man/man3/wxTextAttr.*
+%{_libdir}/erlang/man/man3/wxTextCtrl.*
+%{_libdir}/erlang/man/man3/wxTextDataObject.*
+%{_libdir}/erlang/man/man3/wxTextEntryDialog.*
+%{_libdir}/erlang/man/man3/wxToggleButton.*
+%{_libdir}/erlang/man/man3/wxToolBar.*
+%{_libdir}/erlang/man/man3/wxToolbook.*
+%{_libdir}/erlang/man/man3/wxToolTip.*
+%{_libdir}/erlang/man/man3/wxTopLevelWindow.*
+%{_libdir}/erlang/man/man3/wxTreebook.*
+%{_libdir}/erlang/man/man3/wxTreeCtrl.*
+%{_libdir}/erlang/man/man3/wxTreeEvent.*
+%{_libdir}/erlang/man/man3/wxUpdateUIEvent.*
+%{_libdir}/erlang/man/man3/wxWindow.*
+%{_libdir}/erlang/man/man3/wxWindowCreateEvent.*
+%{_libdir}/erlang/man/man3/wxWindowDC.*
+%{_libdir}/erlang/man/man3/wxWindowDestroyEvent.*
+%{_libdir}/erlang/man/man3/wxXmlResource.*
 %endif
-%endif # __with_wxwidgets
 
 %files xmerl
 %{_libdir}/erlang/lib/xmerl-*/
 %if %{with doc}
-%{_mandir}/man3/xmerl.*
-%{_mandir}/man3/xmerl_eventp.*
-%{_mandir}/man3/xmerl_sax_parser.*
-%{_mandir}/man3/xmerl_scan.*
-%{_mandir}/man3/xmerl_xpath.*
-%{_mandir}/man3/xmerl_xs.*
-%{_mandir}/man3/xmerl_xsd.*
+%{_libdir}/erlang/man/man3/xmerl.*
+%{_libdir}/erlang/man/man3/xmerl_eventp.*
+%{_libdir}/erlang/man/man3/xmerl_sax_parser.*
+%{_libdir}/erlang/man/man3/xmerl_scan.*
+%{_libdir}/erlang/man/man3/xmerl_xpath.*
+%{_libdir}/erlang/man/man3/xmerl_xs.*
+%{_libdir}/erlang/man/man3/xmerl_xsd.*
 %endif
 
+%files -n emacs-erlang
+%dir %{_emacs_sitelispdir}/erlang
+%doc %{_emacs_sitelispdir}/erlang/README
+%{_emacs_sitelispdir}/erlang/*.elc
+%{_emacs_sitestartdir}/erlang-init.el
 
-%changelog
-* Tue Oct 25 2022 Peter Lemenkov <lemenkov@gmail.com> - 25.1.2-1
-- Ver. 25.1.2
-
-* Mon Oct  3 2022 Peter Lemenkov <lemenkov@gmail.com> - 25.1.1-1
-- Ver. 25.1.1
-
-* Wed Sep 21 2022 Peter Lemenkov <lemenkov@gmail.com> - 25.1-1
-- Ver. 25.1
-
-* Thu Aug 18 2022 Peter Lemenkov <lemenkov@gmail.com> - 25.0.4-1
-- Ver. 25.0.4
-
-* Thu Jul 28 2022 Peter Lemenkov <lemenkov@gmail.com> - 25.0.3-3
-- Rebuild with new wxWidgets
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 25.0.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jul 16 2022 Peter Lemenkov <lemenkov@gmail.com> - 25.0.3-1
-- Ver. 25.0.3
-
-* Tue Jul 12 2022 Peter Lemenkov <lemenkov@gmail.com> - 25.0.2-1
-- Ver. 25.0.2
-
-* Thu Jun 23 2022 Peter Lemenkov <lemenkov@gmail.com> - 24.3.4.2-1
-- Ver. 24.3.4.2
-
-* Wed Jun  8 2022 Peter Lemenkov <lemenkov@gmail.com> - 24.3.4.1-1
-- Ver. 24.3.4.1
-
-* Tue May 24 2022 Peter Lemenkov <lemenkov@gmail.com> - 24.3.4-2
-- Downgrade to OpenSSL 1.x
-
-* Wed May  4 2022 Peter Lemenkov <lemenkov@gmail.com> - 24.3.4-1
-- Ver. 24.3.4
-
-* Fri Apr  8 2022 Peter Lemenkov <lemenkov@gmail.com> - 24.3.3-2
-- Temporarily disable FIPS (doesn't work reliably with OpenSSL 3.0 yet)
-
-* Tue Mar 29 2022 Peter Lemenkov <lemenkov@gmail.com> - 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 <jeckersb@redhat.com> - 24.2.2-2
-- Keep documentation chunks in the code path (rhbz#2068758)
-
-* Tue Mar  1 2022 Peter Lemenkov <lemenkov@gmail.com> - 24.2.2-1
-- Ver. 24.2.2
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 24.2.1-2
-- Rebuilt for java-17-openjdk as system jdk
-
-* Wed Jan 26 2022 Peter Lemenkov <lemenkov@gmail.com> - 24.2.1-1
-- Ver. 24.2.1
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 24.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Dec 15 2021 Peter Lemenkov <lemenkov@gmail.com> - 24.2-1
-- Ver. 24.2
-
-* Mon Nov 22 2021 Peter Lemenkov <lemenkov@gmail.com> - 24.1.7-1
-- Ver. 24.1.7
-
-* Thu Nov 18 2021 Peter Lemenkov <lemenkov@gmail.com> - 24.1.6-1
-- Ver. 24.1.6
-
-* Sat Nov 13 2021 Peter Lemenkov <lemenkov@gmail.com> - 24.1.5-1
-- Ver. 24.1.5
-
-* Tue Nov  2 2021 Peter Lemenkov <lemenkov@gmail.com> - 24.1.4-1
-- Ver. 24.1.4
-
-* Thu Oct 28 2021 Peter Lemenkov <lemenkov@gmail.com> - 24.1.3-1
-- Ver. 24.1.3
-
-* Tue Oct 12 2021 Peter Lemenkov <lemenkov@gmail.com> - 24.1.2-2
-- Fix FTBFS with OpenSSL 3.0
-
-* Tue Oct  5 2021 Peter Lemenkov <lemenkov@gmail.com> - 24.1.2-1
-- Ver. 24.1.2
-
-* Mon Oct  4 2021 Peter Lemenkov <lemenkov@gmail.com> - 24.1.1-1
-- Ver. 24.1.1
-
-* Thu Sep 23 2021 Peter Lemenkov <lemenkov@gmail.com> - 24.1-1
-- Ver. 24.1
-
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 24.0.6-2
-- Rebuilt with OpenSSL 3.0.0
-
-* Fri Sep  3 2021 Peter Lemenkov <lemenkov@gmail.com> - 24.0.6-1
-- Ver. 24.0.6
-
-* Tue Aug  3 2021 Peter Lemenkov <lemenkov@gmail.com> - 24.0.5-1
-- Ver. 24.0.5
-
-* Thu Jul 22 2021 Peter Lemenkov <lemenkov@gmail.com> - 24.0.4-1
-- Ver. 24.0.4
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 24.0.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jun 29 2021 Peter Lemenkov <lemenkov@gmail.com> - 24.0.3-1
-- Ver. 24.0.3
-
-* Tue Jun 01 2021 Peter Lemenkov <lemenkov@gmail.com> - 24.0.2-1
-- Ver. 24.0.2
-
-* Fri May 21 2021 John Eckersberg <jeckersb@redhat.com> - 24.0.1-1
-- Ver. 24.0.1
-
-* Wed May 12 2021 Peter Lemenkov <lemenkov@gmail.com> - 24.0-1
-- Ver. 24.0
-
-* Wed Apr 21 2021 Peter Lemenkov <lemenkov@gmail.com> - 24.0-0.2.rc3
-- Ver. 24.0-rc3
-
-* Sat Apr  3 2021 Peter Lemenkov <lemenkov@gmail.com> - 24.0-0.1.rc2
-- Ver. 24.0-rc2
-- Removed hipe
-
-* Tue Mar 30 2021 Peter Lemenkov <lemenkov@gmail.com> - 23.3.1-1
-- Ver. 23.3.1
-
-* Wed Mar 24 2021 Peter Lemenkov <lemenkov@gmail.com> - 23.3-1
-- Ver. 23.3
-
-* Fri Mar  5 2021 Peter Lemenkov <lemenkov@gmail.com> - 23.2.7-1
-- Ver. 23.2.7
-
-* Thu Feb 25 2021 Peter Lemenkov <lemenkov@gmail.com> - 23.2.6-1
-- Ver. 23.2.6
-
-* Tue Feb 16 2021 Peter Lemenkov <lemenkov@gmail.com> - 23.2.5-1
-- Ver. 23.2.5
-
-* Thu Feb  4 2021 John Eckersberg <jeckersb@redhat.com> - 23.2.4-1
-- Ver. 23.2.4
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 23.2.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jan 20 2021 Peter Lemenkov <lemenkov@gmail.com> - 23.2.3-1
-- Ver. 23.2.3
-
-* Fri Jan 15 2021 Peter Lemenkov <lemenkov@gmail.com> - 23.2.2-1
-- Ver. 23.2.2
-- Disable XEmacs support (dead upstream, scheduled for removal from Fedora)
-
-* Tue Dec 22 2020 Peter Lemenkov <lemenkov@gmail.com> - 23.2.1-1
-- Ver. 23.2.1
-
-* Thu Dec 17 2020 Peter Lemenkov <lemenkov@gmail.com> - 23.2-1
-- Ver. 23.2
-
-* Fri Dec 11 2020 Peter Lemenkov <lemenkov@gmail.com> - 23.1.5-1
-- Ver. 23.1.5
-
-* Fri Nov 20 2020 Peter Lemenkov <lemenkov@gmail.com> - 23.1.4-1
-- Ver. 23.1.4
-
-* Tue Nov 17 2020 Peter Lemenkov <lemenkov@gmail.com> - 23.1.3-1
-- Ver. 23.1.3
-
-* Sat Oct  3 2020 Peter Lemenkov <lemenkov@gmail.com> - 23.1.1-1
-- Ver. 23.1.1
-
-* Tue Sep 15 2020 Peter Lemenkov <lemenkov@gmail.com> - 23.0.4-1
-- Ver. 23.0.4
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 23.0.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 20 2020 Peter Lemenkov <lemenkov@gmail.com> - 23.0.3-1
-- Ver. 23.0.3
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 23.0.2-2
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Thu May 28 2020 Peter Lemenkov <lemenkov@gmail.com> - 23.0.2-1
-- Ver. 23.0.2
-
-* Wed May 20 2020 Peter Lemenkov <lemenkov@gmail.com> - 23.0.1-1
-- Ver. 23.0.1
-
-* Wed May 13 2020 Peter Lemenkov <lemenkov@gmail.com> - 23.0-1
-- Ver. 23.0
-
-* Thu Apr 23 2020 Peter Lemenkov <lemenkov@gmail.com> - 23.0-0.2.rc3
-- Ver. 23.0-rc3
-
-* Sun Apr 19 2020 Peter Lemenkov <lemenkov@gmail.com> - 23.0-0.1.rc2
-- Ver. 23.0-rc2
-
-* Thu Apr  9 2020 Peter Lemenkov <lemenkov@gmail.com> - 22.3.2-1
-- Ver. 22.3.2
-
-* Fri Feb 28 2020 Peter Lemenkov <lemenkov@gmail.com> - 22.2.8-1
-- Ver. 22.2.8
-
-* Fri Feb 21 2020 Peter Lemenkov <lemenkov@gmail.com> - 22.2.7-2
-- Fix building with GCC 10 (-fno-common)
-
-* Fri Feb 21 2020 Peter Lemenkov <lemenkov@gmail.com> - 22.2.7-1
-- Ver. 22.2.7
-
-* Thu Feb  6 2020 Peter Lemenkov <lemenkov@gmail.com> - 22.2.6-1
-- Ver. 22.2.6
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 22.2.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Jan 13 2020 Peter Lemenkov <lemenkov@gmail.com> - 22.2.2-1
-- Ver. 22.2.2
-
-* Sat Dec 28 2019 Peter Lemenkov <lemenkov@gmail.com> - 22.2.1-1
-- Ver. 22.2.1
-
-* Thu Nov 21 2019 John Eckersberg <eck@redhat.com> - 22.1.8-1
-- Ver. 22.1.8
-- Re-enable s390x, but disable kernel polling, see rhbz#1770256
-
-* Mon Nov 11 2019 John Eckersberg <eck@redhat.com> - 22.1.7-1
-- Ver. 22.1.7
-- Add ExcludeArch for s390x, see rhbz#1770256
-
-* Tue Nov  5 2019 John Eckersberg <eck@redhat.com> - 22.1.5-1
-- Ver. 22.1.5
-
-* Mon Sep 16 2019 Peter Lemenkov <lemenkov@gmail.com> - 22.0.7-3
-- Enable arches disabled in a previous build
-
-* Wed Sep 11 2019 Peter Lemenkov <lemenkov@gmail.com> - 22.0.7-2
-- Disable arches with a broken builders
-- Expose a correct NIF API version
-
-* Tue Jul 30 2019 Peter Lemenkov <lemenkov@gmail.com> - 22.0.7-1
-- Ver. 22.0.7
-- Removed otp_mibs application
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 21.3.8.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Jul 15 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.3.8.6-1
-- Ver. 21.3.8.6
-
-* Mon Jul  8 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.3.8.5-1
-- Ver. 21.3.8.5
-
-* Wed Jun 19 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.3.8.4-1
-- Ver. 21.3.8.4
-
-* Tue Jun 04 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.3.8.3-1
-- Ver. 21.3.8.3
-
-* Mon May 20 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.3.8.2-1
-- Ver. 21.3.8.2
-
-* Fri May 17 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.3.8.1-1
-- Ver. 21.3.8.1
-
-* Wed May 01 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.3.7-1
-- Ver. 21.3.7
-
-* Thu Apr 18 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.3.6-1
-- Ver. 21.3.6
-
-* Mon Apr 15 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.3.5-1
-- Ver. 21.3.5
-
-* Sat Apr 13 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.3.4-1
-- Ver. 21.3.4
-
-* Tue Apr 02 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.3.3-1
-- Ver. 21.3.3
-
-* Fri Mar 22 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.3.2-1
-- Ver. 21.3.2
-
-* Tue Mar 19 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.3.1-1
-- Ver. 21.3.1
-
-* Tue Mar 12 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.3-1
-- Ver. 21.3
-
-* Thu Mar 07 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.2.7-1
-- Ver. 21.2.7
-
-* Tue Feb 19 2019 Kalev Lember <klember@redhat.com> - 21.2.6-2
-- Rebuilt against fixed atk (#1626575)
-
-* Tue Feb 19 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.2.6-1
-- Ver. 21.2.6
-
-* Tue Feb 05 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.2.5-1
-- Ver. 21.2.5
-- Revert: Fix EC detection
-
-* Mon Feb 04 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.2.4-2
-- Fix EC detection
-
-* Thu Jan 31 2019 Peter Lemenkov <lemenkov@gmail.com> - 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 <releng@fedoraproject.org> - 20.3.8.18-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jan 22 2019 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.18-1
-- Ver. 20.3.8.18
-
-* Tue Jan 15 2019 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.17-2
-- Fix issue with nodes info querying
-- Enable verbose build logs
-
-* Thu Jan 10 2019 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.17-1
-- Ver. 20.3.8.17
-
-* Tue Jan 08 2019 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.16-1
-- Ver. 20.3.8.16
-
-* Mon Dec 10 2018 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.15-1
-- Ver. 20.3.8.15
-
-* Fri Nov 16 2018 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.14-1
-- Ver. 20.3.8.14
-- Fix epmd systemd files
-
-* Thu Sep 20 2018 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.9-2
-- Install man-pages into system-wide directories (as Debian already did).
-
-* Tue Sep 18 2018 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.9-1
-- Ver. 20.3.8.9
-
-* Wed Aug 29 2018 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.8-1
-- Ver. 20.3.8.8
-
-* Wed Aug 15 2018 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.6-1
-- Ver. 20.3.8.6
-
-* Fri Aug 10 2018 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.5-1
-- Ver. 20.3.8.5
-
-* Fri Aug 03 2018 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.4-1
-- Ver. 20.3.8.4
-
-* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 20.3.8.3-2
-- Rebuild with fixed binutils
-
-* Mon Jul 30 2018 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.3-1
-- Ver. 20.3.8.3
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20.3.8.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jul 10 2018 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.2-2
-- Fix FTBFS on F-29 and higher
-
-* Tue Jul 10 2018 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.2-1
-- Ver. 20.3.8.2
-
-* Wed Jun 27 2018 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.1-1
-- Ver. 20.3.8.1
-
-* Thu Jun 14 2018 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8-1
-- Ver. 20.3.8
-
-* Fri May 18 2018 Troy Dawson <tdawson@redhat.com> - 20.3.6-2
-- Make xemacs an optional component
-
-* Tue May 15 2018 Peter Lemenkov <lemenkov@gmail.com> - 20.3.6-1
-- Ver. 20.3.6
-
-* Fri Apr 06 2018 Peter Lemenkov <lemenkov@gmail.com> - 20.3.2-2
-- Allow building against OpenSSL 1.1.0+
-
-* Fri Mar 23 2018 Peter Lemenkov <lemenkov@gmail.com> - 20.3.2-1
-- Ver. 20.3.2
-
-* Tue Mar 20 2018 Richard W.M. Jones <rjones@redhat.com> - 20.3-2
-- Disable fop on riscv64.
-
-* Wed Mar 14 2018 Peter Lemenkov <lemenkov@gmail.com> - 20.3
-- Ver. 20.3
-
-* Thu Feb 22 2018 Peter Lemenkov <lemenkov@gmail.com> - 20.2.4-1
-- Ver. 20.2.4
-
-* Tue Feb 20 2018 Peter Lemenkov <lemenkov@gmail.com> - 20.2.3-1
-- Ver. 20.2.3
-- Removed gs (also removed tcl/tk dependency), percept
-- Application typer was merged into dialyzer
-- NIF version bumped up to 2.13
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 19.3.6.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Dec 19 2017 Peter Lemenkov <lemenkov@gmail.com> - 19.3.6.5
-- Ver. 19.3.6.5
-
-* Mon Nov 27 2017 Peter Lemenkov <lemenkov@gmail.com> - 19.3.6.4
-- Ver. 19.3.6.4
-- ssl: Countermeasurements for Bleichenbacher attack
-
-* Tue Aug  1 2017 Randy Barlow <bowlofeggs@fedoraproject.org> - 19.3.6.2-2
-- Search /usr/share/erlang/lib for libraries as well
-
-* Mon Jul 31 2017 Peter Lemenkov <lemenkov@gmail.com> - 19.3.6.2-1
-- Ver. 19.3.6.2
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 19.3.6.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Jun 30 2017 Peter Lemenkov <lemenkov@gmail.com> - 19.3.6.1-1
-- Ver. 19.3.6.1
-
-* Fri Jun 16 2017 Peter Lemenkov <lemenkov@gmail.com> - 19.3.6-2
-- Fix EPMD port assignment in IPv6 env. (GH#1487)
-
-* Tue Jun 13 2017 Peter Lemenkov <lemenkov@gmail.com> - 19.3.6-1
-- Ver. 19.3.6
-
-* Wed Jun  7 2017 Peter Lemenkov <lemenkov@gmail.com> - 19.3.5-1
-- Ver. 19.3.5
-- Enabled tests
-
-* Fri May 12 2017 Peter Lemenkov <lemenkov@gmail.com> - 19.3.4-1
-- Ver. 19.3.4
-- Require javapackages-tools (/use/share/java)
-- Use /dev/null as a homedir for EPMD (its shell is /sbin/nologin anyway)
-- Removed beam appilciation (non-SMP VM).
-
-* Tue May  2 2017 Peter Lemenkov <lemenkov@gmail.com> - 19.3.3-1
-- Ver. 19.3.3
-
-* Mon Apr 24 2017 Peter Lemenkov <lemenkov@gmail.com> - 19.3.2-1
-- Ver. 19.3.2
-
-* Tue Apr  4 2017 Peter Lemenkov <lemenkov@gmail.com> - 19.3.1-1
-- Ver. 19.3.1
-
-* Tue Mar 21 2017 Peter Lemenkov <lemenkov@gmail.com> - 19.3-2
-- Fix for CVE-2016-10253
-
-* Wed Mar 15 2017 Peter Lemenkov <lemenkov@gmail.com> - 19.3-1
-- Ver. 19.3
-
-* Wed Feb  8 2017 Peter Lemenkov <lemenkov@gmail.com> - 19.2.3-1
-- Ver. 19.2.3
-
-* Wed Feb  1 2017 Peter Lemenkov <lemenkov@gmail.com> - 19.2.2-1
-- Ver. 19.2.2
-
-* Wed Jan 18 2017 Peter Lemenkov <lemenkov@gmail.com> - 19.2.1-1
-- Ver. 19.2.1
-
-* Wed Jan 11 2017 Peter Lemenkov <lemenkov@gmail.com> - 19.2-1
-- Ver. 19.2
-
-* Wed Nov 23 2016 Peter Lemenkov <lemenkov@gmail.com> - 19.1.6-2
-- Fix HiPE by disabling -fpie
-- Fix dialyzer generation
-
-* Wed Nov  9 2016 Peter Lemenkov <lemenkov@gmail.com> - 19.1.6-1
-- Ver. 19.1.6
-
-* Mon Nov  7 2016 Peter Lemenkov <lemenkov@gmail.com> - 19.1.5-1
-- Ver. 19.1.5
-
-* Fri Oct 14 2016 Peter Lemenkov <lemenkov@gmail.com> - 19.1.4-1
-- Ver. 19.1.4
-
-* Tue Oct 11 2016 Peter Lemenkov <lemenkov@gmail.com> - 19.1.3-1
-- Ver. 19.1.3
-
-* Thu Oct  6 2016 Peter Lemenkov <lemenkov@gmail.com> - 19.1.2-1
-- Ver. 19.1.2
-
-* Tue Oct  4 2016 Peter Lemenkov <lemenkov@gmail.com> - 19.1.1-1
-- Ver. 19.1.1
-
-* Wed Sep 14 2016 Peter Lemenkov <lemenkov@gmail.com> - 19.0.7-1
-- Ver. 19.0.7
-
-* Wed Sep 14 2016 Peter Lemenkov <lemenkov@gmail.com> - 19.0.6-1
-- Ver. 19.0.6
-
-* Tue Aug 23 2016 Peter Lemenkov <lemenkov@gmail.com> - 19.0.5-1
-- Ver. 19.0.5
-
-* Tue Aug 16 2016 Peter Lemenkov <lemenkov@gmail.com> - 19.0.4-1
-- Ver. 19.0.4
-
-* Fri Aug 12 2016 Michal Toman <mtoman@fedoraproject.org> - 19.0.2-2
-- Disable doc on MIPS
-
-* Wed Jul 27 2016 Peter Lemenkov <lemenkov@gmail.com> - 19.0.2-1
-- Ver. 19.0.2
-- The following packages were removed - ose, test_server (merged into common_test), webtool
-- Merge (x)emacs subpackages into erlang-typer
-
-* Tue Jul 26 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.3.4.2-1
-- Ver. 18.3.4.2
-
-* Fri Jul 15 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.3.4.1-1
-- Ver. 18.3.4.1
-- Allow node registration via IPv6 (PR erlang/otp#1129)
-
-* Tue Jun 14 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.3.4-1
-- Ver. 18.3.4
-
-* Mon Jun 13 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.3.3-2
-- Fix regression with GCC 6.x.y
-
-* Wed May 11 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.3.3-1
-- Ver. 18.3.3
-
-* Wed Apr 27 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.3.2-1
-- Ver. 18.3.2
-
-* Sun Apr 10 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.3.1-2
-- Enable selective building
+%files -n emacs-erlang-el
+%{_emacs_sitelispdir}/erlang/*.el
 
-* Thu Apr  7 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.3.1-1
-- Ver. 18.3.1
+%files -n xemacs-erlang
+%dir %{_xemacs_sitelispdir}/erlang
+%doc %{_xemacs_sitelispdir}/erlang/README
+%{_xemacs_sitelispdir}/erlang/*.elc
+%{_xemacs_sitestartdir}/erlang-init.el
 
-* Thu Mar 31 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.3-2
-- Added patch to suppress sending systemd notifications from epmd if not
-  started as a systemd service.
+%files -n xemacs-erlang-el
+%{_xemacs_sitelispdir}/erlang/*.el
 
-* Thu Mar 24 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.3-1
-- Ver. 18.3
 
+%changelog
 * Sun Feb 28 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.2.4-2
 - Fixed issue with nodes registration over IPv6
 
@@ -2837,7 +2639,7 @@
 - new release R12B-0
 
 * Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - R11B-6
-- Rebuild for deps
+ - Rebuild for deps
 
 * Sun Aug 19 2007 Gerard Milmeister <gemi@bluewin.ch> - R11B-5.3
 - fix some permissions

otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch Changed

@@ -6,10 +6,10 @@
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
-index 42d4395eb2..307ef11828 100644
+index 8e55fa7..9512faa 100644
 --- a/erts/etc/common/Makefile.in
 +++ b/erts/etc/common/Makefile.in
-@@ -552,10 +552,6 @@ endif
+@@ -551,10 +551,6 @@ endif
  ifneq ($(INSTALL_TOP_BIN),)
  	$(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)"
  endif
@@ -21,10 +21,10 @@
  	$(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 6634ae3..fa18956 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

otp-0002-Remove-rpath.patch Changed

@@ -5,15 +5,28 @@
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
-index 25167a8a3a..2345970fa9 100644
+index e66c0ca..574cdf5 100644
 --- a/lib/crypto/c_src/Makefile.in
 +++ b/lib/crypto/c_src/Makefile.in
-@@ -147,7 +147,7 @@ endif
- endif
+@@ -90,7 +90,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 ff9d3e1..d3aba77 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)

otp-0003-Do-not-install-C-sources.patch Changed

@@ -14,46 +14,86 @@
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
-index 82a6b6e87a..5f2fe8ba7d 100644
+index 2b72e1a..0522562 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
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+@@ -143,8 +143,6 @@ release_spec: opt
+ ifneq ($(findstring ose,$(TARGET)),ose)
  	$(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) "$(RELSYSDIR)/priv/lib"
+ endif
 -	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
 -	$(INSTALL_DATA) *.c "$(RELSYSDIR)/c_src"
  
  release_docs_spec:
  
+diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
+index 574cdf5..428c316 100644
+--- a/lib/crypto/c_src/Makefile.in
++++ b/lib/crypto/c_src/Makefile.in
+@@ -200,14 +200,10 @@ 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"
+ ifneq ($(findstring ose,$(TARGET)),ose)
+-	$(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
+ endif
 diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
-index 0a5ae800be..2cc354c43e 100644
+index 777d709..57917ae 100644
 --- a/lib/erl_interface/src/Makefile.in
 +++ b/lib/erl_interface/src/Makefile.in
-@@ -712,13 +712,11 @@ ifeq (@DYNAMIC_LIB@, yes)
- endif
+@@ -905,14 +905,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 b9f92a0..9612f24 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 045b6d8..39be02a 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 +103,7 @@
  endif
  
 diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in
-index d1b26743a6..cf8faae1f5 100644
+index 685eb5d..6c8a432 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
@@ -79,7 +119,7 @@
  endif
  
 diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in
-index 27b156a2c9..f11ff303b6 100644
+index e9fc5f4..ac9fb73 100644
 --- a/lib/os_mon/c_src/Makefile.in
 +++ b/lib/os_mon/c_src/Makefile.in
 @@ -126,8 +126,6 @@ $(OBJDIR)/memsup.o: memsup.h
@@ -91,3 +131,31 @@
  	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
  	$(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin"
  
+diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in
+index 448b8c6..860d504 100644
+--- a/lib/runtime_tools/c_src/Makefile.in
++++ b/lib/runtime_tools/c_src/Makefile.in
+@@ -157,10 +157,8 @@ docs:
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+ ifneq ($(findstring ose,$(TARGET)),ose)
+-	$(INSTALL_PROGRAM) $(DYNTRACE_OBJS) "$(RELSYSDIR)/priv/obj"
+ 	$(INSTALL_PROGRAM) $(NIF_LIB) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
+ endif
+ 
+diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
+index 66bba22..eea37fc 100644
+--- a/lib/tools/c_src/Makefile.in
++++ b/lib/tools/c_src/Makefile.in
+@@ -198,8 +198,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"

otp-0004-Do-not-install-Java-sources.patch Changed

@@ -4,11 +4,24 @@
 
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
+diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
+index d9100cf..6886c71 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 1c8364e..34b64a8 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

otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch Changed

@@ -6,10 +6,10 @@
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile
-index 8e3882bfdc..ea999cf9c7 100644
+index 0c5acd9..5f8f1e3 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,32 +21,33 @@
  XML_REF3_FILES = cpu_sup.xml \
  	disksup.xml \
  	memsup.xml \
+ 	os_mon_mib.xml \
  	os_sup.xml \
 -	nteventlog.xml
 +	$(NTEVENTLOG_DOCFILE)
  
- XML_REF6_FILES = os_mon_app.xml
+ 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 9aa068c..1003d24 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

otp-0006-Do-not-install-erlang-sources.patch Changed

@@ -8,10 +8,10 @@
 Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 
 diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile
-index 1994aa1302..007b7d44bd 100644
+index 52034a0..56d91b9 100644
 --- a/erts/preloaded/src/Makefile
 +++ b/erts/preloaded/src/Makefile
-@@ -117,8 +117,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk
+@@ -86,8 +86,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: $(APP_TARGET)
@@ -21,10 +21,10 @@
  	$(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile
-index 9e13d02c8a..77ba98c2f8 100644
+index 5b34017..d4677d6 100644
 --- a/lib/asn1/src/Makefile
 +++ b/lib/asn1/src/Makefile
-@@ -157,7 +157,7 @@ release_spec: opt
+@@ -155,7 +155,7 @@ release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -34,10 +34,10 @@
  	$(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples"
  
 diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile
-index 00f13589f3..5bf4e50f14 100644
+index 987345c..f53546a 100644
 --- a/lib/common_test/src/Makefile
 +++ b/lib/common_test/src/Makefile
-@@ -157,7 +157,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -144,7 +144,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -46,27 +46,11 @@
  	$(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 4ff5e678ee..4e3fa5c60f 100644
---- a/lib/common_test/test_server/Makefile
-+++ b/lib/common_test/test_server/Makefile
-@@ -83,9 +83,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 d801d6baa0..4eed19b516 100644
+index 299b289..36a048b 100644
 --- a/lib/compiler/src/Makefile
 +++ b/lib/compiler/src/Makefile
-@@ -188,8 +188,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -172,8 +172,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -77,11 +61,107 @@
  	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
  
+diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile
+index b79f0ec..30d1a1d 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 da8dcf0..88b3993 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 f9107ff..74d337d 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 72b063f..0fdb82e 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 cd559e1..bdf035e 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 7a14db6..4b55398 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 90e1e51..05826e0 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 893f679390..6f8a329421 100644
+index 6e4008e..c2d00fc 100644
 --- a/lib/crypto/src/Makefile
 +++ b/lib/crypto/src/Makefile
-@@ -81,8 +81,6 @@ docs:
+@@ -82,8 +82,6 @@ docs:
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
@@ -91,7 +171,7 @@
  	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \
  		$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile
-index 2fb955b2e3..6ddce27ec1 100644
+index f115f49..e7dc360 100644
 --- a/lib/debugger/src/Makefile
 +++ b/lib/debugger/src/Makefile
 @@ -117,7 +117,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
@@ -104,10 +184,10 @@
  	$(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile
-index c934ecdc2b..cc266f48e2 100644
+index 770af21..4f8a6d8 100644
 --- a/lib/dialyzer/src/Makefile
 +++ b/lib/dialyzer/src/Makefile
-@@ -162,7 +162,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -152,7 +152,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -117,11 +197,11 @@
  	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
 diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
-index 75e23d4191..7097541548 100644
+index e0bbbdf..10771b2 100644
 --- a/lib/diameter/src/Makefile
 +++ b/lib/diameter/src/Makefile
-@@ -266,11 +266,8 @@ release_spec: opt
- 	$(MAKE) ERL_DETERMINISTIC=$(ERL_DETERMINISTIC) $(EXAMPLE_DIRS:%/=release_examples_%)
+@@ -251,11 +251,8 @@ release_spec: opt
+ 	$(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%)
  
  $(TARGET_DIRS:%/=release_src_%): release_src_%:
 -	$(INSTALL_DIR) "$(RELSYSDIR)/src/$*"
@@ -135,10 +215,10 @@
  $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%:
  	$(INSTALL_DIR) "$(RELSYSDIR)/examples/$*"
 diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile
-index a455662049..e5b2f886ed 100644
+index 4e5a418..c0bb0c3 100644
 --- a/lib/edoc/src/Makefile
 +++ b/lib/edoc/src/Makefile
-@@ -87,7 +87,7 @@ release_spec: opt
+@@ -88,7 +88,7 @@ release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -148,30 +228,25 @@
  release_docs_spec:
  
 diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile
-index 04a84a4766..78fc4a9687 100644
+index cd3c102..b55c513 100644
 --- a/lib/eldap/src/Makefile
 +++ b/lib/eldap/src/Makefile
-@@ -98,13 +98,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
+@@ -99,10 +99,6 @@ 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_DATA) $(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:
+ 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
  
 diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile
-index 458094e35f..cc3368ad02 100644
+index 7d41506..3f3562f 100644
 --- a/lib/erl_docgen/src/Makefile
 +++ b/lib/erl_docgen/src/Makefile
-@@ -91,8 +91,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+@@ -90,8 +90,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
@@ -181,7 +256,7 @@
  	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile
-index fc66cc1eaf..a567965ed4 100644
+index 461a52d..1f2e885 100644
 --- a/lib/et/src/Makefile
 +++ b/lib/et/src/Makefile
 @@ -109,7 +109,6 @@ release_spec: opt
@@ -193,19 +268,172 @@
  	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
  	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
 diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile
-index f4eaf6807a..2a49a2ca7a 100644
+index 86a6d88..5732fd8 100644
 --- a/lib/eunit/src/Makefile
 +++ b/lib/eunit/src/Makefile
-@@ -121,7 +121,6 @@ release_spec: opt
+@@ -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) $(BEHAVIOUR_SOURCES) "$(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/gs/src/Makefile b/lib/gs/src/Makefile
+index ff3080e..60337dd 100644
+--- a/lib/gs/src/Makefile
++++ b/lib/gs/src/Makefile
+@@ -109,8 +109,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(APP_SRC) $(ERL_FILES) $(HRL_FILES) $(GEN_HRL_FILES) \
+-		$(GSTK_GENERIC) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) $(GEN_HRL_FILES) \
++		"$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bitmap"
+diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile
+index 0938010..134ed7b 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 f0af6ac..16b512e 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 a82e28c..f364a53 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 f6f6f6b..4369923 100644
+--- a/lib/hipe/llvm/Makefile
++++ b/lib/hipe/llvm/Makefile
+@@ -103,7 +103,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 d44be2d..ed81f10 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 be5c9bc..d40b322 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 1bf52fe..5049bec 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 4a78ad7..1b1ce05 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_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 a6da81a..60870be 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 f8daa2b..48e5d49 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 62f62792f0..ca4b539017 100644
+index cb97b52..cb13dfb 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
@@ -218,7 +446,7 @@
  	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile
-index 481c4f66eb..896a806695 100644
+index 4a4eef9..c779c8e 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
@@ -231,10 +459,10 @@
  	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile
-index abf8413f33..42925ba58f 100644
+index 1c05d45..88f9f62 100644
 --- a/lib/inets/src/http_server/Makefile
 +++ b/lib/inets/src/http_server/Makefile
-@@ -134,7 +134,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -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"
@@ -244,10 +472,10 @@
  	$(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 405e86105a..a8b932772a 100644
+index 0a4b625..1b1d83d 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
+@@ -115,7 +115,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
  	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
  	$(INSTALL_DIR)  "$(RELSYSDIR)/src/inets_app"
@@ -256,11 +484,24 @@
  	$(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 d5d94e1..5583064 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 2149e89776..891d3e6f6a 100644
+index 57daceb..1cebd80 100644
 --- a/lib/kernel/src/Makefile
 +++ b/lib/kernel/src/Makefile
-@@ -229,7 +229,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -200,7 +200,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -269,7 +510,7 @@
  	$(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 c681b88428..8cb286181a 100644
+index 8f8e6ec..9e0bc82 100644
 --- a/lib/megaco/src/app/Makefile
 +++ b/lib/megaco/src/app/Makefile
 @@ -114,7 +114,7 @@ release_spec: opt
@@ -282,10 +523,10 @@
  	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
  
 diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile
-index 9ecb649f0c..3ca5654eb3 100644
+index 711fbb7..1db4593 100644
 --- a/lib/megaco/src/binary/Makefile
 +++ b/lib/megaco/src/binary/Makefile
-@@ -154,7 +154,7 @@ release_spec: opt
+@@ -176,7 +176,7 @@ release_spec: opt
  	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
  	$(INSTALL_DIR)  "$(RELSYSDIR)/src/binary"
@@ -295,7 +536,7 @@
  
  release_docs_spec:
 diff --git a/lib/megaco/src/engine/Makefile b/lib/megaco/src/engine/Makefile
-index cc4974e09d..b7a7c703b3 100644
+index 208942c..d5b7218 100644
 --- a/lib/megaco/src/engine/Makefile
 +++ b/lib/megaco/src/engine/Makefile
 @@ -102,7 +102,7 @@ release_spec: opt
@@ -308,10 +549,10 @@
  
  
 diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
-index d8c5c68b99..2053d3297b 100644
+index 39be02a..8c6ba31 100644
 --- a/lib/megaco/src/flex/Makefile.in
 +++ b/lib/megaco/src/flex/Makefile.in
-@@ -248,7 +248,6 @@ release_spec: opt
+@@ -268,7 +268,6 @@ release_spec: opt
  	$(INSTALL_DIR)  "$(RELSYSDIR)/src/flex"
  	$(INSTALL_DIR)  "$(RELSYSDIR)/priv/lib"
  	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
@@ -320,7 +561,7 @@
  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 ef4232244a..85cfb4b4ee 100644
+index 0c546a8..78f659a 100644
 --- a/lib/megaco/src/tcp/Makefile
 +++ b/lib/megaco/src/tcp/Makefile
 @@ -94,7 +94,7 @@ release_spec: opt
@@ -333,10 +574,10 @@
  
  release_docs_spec:
 diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile
-index 6872b0ec04..a097be4d48 100644
+index f4fc56a..1cc73fd 100644
 --- a/lib/megaco/src/text/Makefile
 +++ b/lib/megaco/src/text/Makefile
-@@ -133,7 +133,7 @@ release_spec: opt
+@@ -135,7 +135,7 @@ release_spec: opt
  	$(INSTALL_DATA) $(BEAM_TARGET_FILES) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
  	$(INSTALL_DIR)  "$(RELSYSDIR)/src/text"
@@ -346,7 +587,7 @@
  
  release_docs_spec:
 diff --git a/lib/megaco/src/udp/Makefile b/lib/megaco/src/udp/Makefile
-index 5699c3e952..f8dcb5c681 100644
+index 7288c20..aefd9f3 100644
 --- a/lib/megaco/src/udp/Makefile
 +++ b/lib/megaco/src/udp/Makefile
 @@ -94,7 +94,7 @@ release_spec: opt
@@ -359,10 +600,10 @@
  
  release_docs_spec:
 diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile
-index 72aa054fb3..08c6c5ffc1 100644
+index dae0df7..6294ae9 100644
 --- a/lib/mnesia/src/Makefile
 +++ b/lib/mnesia/src/Makefile
-@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -133,7 +133,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -372,10 +613,10 @@
  	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
-index 2edb2ceb3e..884e69c7b7 100644
+index 2d42510..7579014 100644
 --- a/lib/observer/src/Makefile
 +++ b/lib/observer/src/Makefile
-@@ -151,7 +151,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -152,7 +152,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -384,7 +625,7 @@
  	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
  	$(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples"
 diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile
-index e18628e94d..fa01850f38 100644
+index 51c9ed3..50a4c10 100644
 --- a/lib/odbc/src/Makefile
 +++ b/lib/odbc/src/Makefile
 @@ -110,7 +110,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
@@ -396,8 +637,36 @@
  	$(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 0eca8dd..18d9627 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 30b74c4..9c6708f 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 ee32f3946f..2413fb68bf 100644
+index 1003d24..1b12154 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
@@ -408,8 +677,35 @@
  	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
  	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+diff --git a/lib/ose/src/Makefile b/lib/ose/src/Makefile
+index a89e939..224d944 100644
+--- a/lib/ose/src/Makefile
++++ b/lib/ose/src/Makefile
+@@ -94,9 +94,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)/include"
+ 	$(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 03892cd..c3ad326 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 c7971750a7..f6024f1184 100644
+index dbecdd2..1d45801 100644
 --- a/lib/parsetools/src/Makefile
 +++ b/lib/parsetools/src/Makefile
 @@ -91,8 +91,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
@@ -421,24 +717,38 @@
  	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+diff --git a/lib/percept/src/Makefile b/lib/percept/src/Makefile
+index 9b963e0..deeb75c 100644
+--- a/lib/percept/src/Makefile
++++ b/lib/percept/src/Makefile
+@@ -97,7 +97,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/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile
-index c1adf58ed4..bba7cae5d6 100644
+index 7474297..a510658 100644
 --- a/lib/public_key/asn1/Makefile
 +++ b/lib/public_key/asn1/Makefile
-@@ -103,8 +103,6 @@ release_spec: opt
+@@ -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_CONFIGS) \
- 		  "$(RELSYSDIR)/asn1"
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ASN_ERLS) "$(RELSYSDIR)/src"
+-	$(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 9b2b442794..a5dcba4ec3 100644
+index 786f244..0463c67 100644
 --- a/lib/public_key/src/Makefile
 +++ b/lib/public_key/src/Makefile
-@@ -111,8 +111,6 @@ $(APPUP_TARGET):	$(APPUP_SRC) ../vsn.mk
+@@ -109,8 +109,6 @@ $(APPUP_TARGET):	$(APPUP_SRC) ../vsn.mk
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
@@ -448,7 +758,7 @@
  	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
  	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 diff --git a/lib/reltool/src/Makefile b/lib/reltool/src/Makefile
-index 173a557d58..6864febbc3 100644
+index 1fea415..a756470 100644
 --- a/lib/reltool/src/Makefile
 +++ b/lib/reltool/src/Makefile
 @@ -100,7 +100,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
@@ -461,10 +771,10 @@
  	$(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 8e8c4074f5..6e380e1b11 100644
+index 99b90f9..25b3ebb 100644
 --- a/lib/runtime_tools/src/Makefile
 +++ b/lib/runtime_tools/src/Makefile
-@@ -99,8 +99,6 @@ docs:
+@@ -97,8 +97,6 @@ docs:
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
@@ -474,10 +784,10 @@
  	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
  	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
 diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile
-index 490e03595d..739830ae3f 100644
+index 7ff6a03..a304900 100644
 --- a/lib/sasl/src/Makefile
 +++ b/lib/sasl/src/Makefile
-@@ -94,7 +94,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -93,7 +93,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -485,24 +795,24 @@
  	$(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.in b/lib/snmp/src/agent/Makefile.in
-index 6ab9ed437a..14ae0bbc79 100644
---- a/lib/snmp/src/agent/Makefile.in
-+++ b/lib/snmp/src/agent/Makefile.in
-@@ -161,7 +161,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile
+index 89037b3..01de885 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) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
+ 	$(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 f5a74aa78e..0340088eb3 100644
+index 7972d95..78a9f2b 100644
 --- a/lib/snmp/src/app/Makefile
 +++ b/lib/snmp/src/app/Makefile
-@@ -144,7 +144,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -132,7 +132,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/src"
  	$(INSTALL_DIR) "$(RELSYSDIR)/src/app"
@@ -512,10 +822,10 @@
  	$(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 f255237a04..04232658c7 100644
+index 54f2e22..488faa4 100644
 --- a/lib/snmp/src/compile/Makefile
 +++ b/lib/snmp/src/compile/Makefile
-@@ -141,7 +141,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/src"
  	$(INSTALL_DIR) "$(RELSYSDIR)/src/compiler"
@@ -525,23 +835,23 @@
  	$(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 693ef75469..61b8dc4692 100644
+index 382f83b..db50c26 100644
 --- a/lib/snmp/src/manager/Makefile
 +++ b/lib/snmp/src/manager/Makefile
-@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -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) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(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 e92506e855..8dc421d2a1 100644
+index c71ecf9..d17e699 100644
 --- a/lib/snmp/src/misc/Makefile
 +++ b/lib/snmp/src/misc/Makefile
-@@ -125,7 +125,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -112,7 +112,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/src"
  	$(INSTALL_DIR) "$(RELSYSDIR)/src/misc"
@@ -551,10 +861,10 @@
  	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  # 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
-index 2fcb164301..2c7acf384d 100644
+index b44c8ee..8f8b58d 100644
 --- a/lib/ssh/src/Makefile
 +++ b/lib/ssh/src/Makefile
-@@ -182,7 +182,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -564,10 +874,10 @@
  	$(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 789bed5c3f..9cd7f7226c 100644
+index 790328d..db08822 100644
 --- a/lib/ssl/src/Makefile
 +++ b/lib/ssl/src/Makefile
-@@ -211,7 +211,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -141,7 +141,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -577,10 +887,10 @@
  	$(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 761d6c4c28..43e7a650a5 100644
+index 9f4a446..50ac11e 100644
 --- a/lib/stdlib/src/Makefile
 +++ b/lib/stdlib/src/Makefile
-@@ -230,7 +230,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -207,7 +207,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -589,10 +899,10 @@
  	$(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 dc0ac61734..5bb265e2c2 100644
+index 2e91adf..0085fca 100644
 --- a/lib/syntax_tools/src/Makefile
 +++ b/lib/syntax_tools/src/Makefile
-@@ -96,8 +96,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -100,8 +100,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin"
@@ -601,24 +911,23 @@
  	$(INSTALL_DIR) "$(RELSYSDIR)/include"
  	$(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include"
  
-diff --git a/lib/tftp/src/Makefile b/lib/tftp/src/Makefile
-index cfcb1ea134..fba9cc5873 100644
---- a/lib/tftp/src/Makefile
-+++ b/lib/tftp/src/Makefile
-@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile
+index 6a26ee2..7336477 100644
+--- a/lib/test_server/src/Makefile
++++ b/lib/test_server/src/Makefile
+@@ -124,7 +124,6 @@ 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) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \
- 	$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TS_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
 diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile
-index b05ce883ec..f8d143922d 100644
+index 9fcfb79..b30b173 100644
 --- a/lib/tools/src/Makefile
 +++ b/lib/tools/src/Makefile
-@@ -109,7 +109,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -107,7 +107,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -627,11 +936,38 @@
  	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
  		"$(RELSYSDIR)/ebin"
+diff --git a/lib/typer/src/Makefile b/lib/typer/src/Makefile
+index 620ca21..9c9390e 100644
+--- a/lib/typer/src/Makefile
++++ b/lib/typer/src/Makefile
+@@ -102,9 +102,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) $(HRL_FILES) $(YRL_FILES) \
+-		"$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
+ 
+diff --git a/lib/webtool/src/Makefile b/lib/webtool/src/Makefile
+index a5a8eaf..be80ba7 100644
+--- a/lib/webtool/src/Makefile
++++ b/lib/webtool/src/Makefile
+@@ -88,8 +88,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) $(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 ce14c0b6df..f052399c0f 100644
+index b345e34..153a270 100644
 --- a/lib/wx/src/Makefile
 +++ b/lib/wx/src/Makefile
-@@ -121,9 +121,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES)
+@@ -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"
@@ -644,10 +980,10 @@
  	$(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include"
  	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile
-index e7e7c8e978..37b7843605 100644
+index f8f0320..099513e 100644
 --- a/lib/xmerl/src/Makefile
 +++ b/lib/xmerl/src/Makefile
-@@ -223,9 +223,7 @@ release_spec: opt
+@@ -218,9 +218,7 @@ release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DIR) "$(RELSYSDIR)/src"

otp-0007-Add-extra-search-directory.patch Deleted

@@ -1,32 +0,0 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Wed, 2 Aug 2017 16:12:19 +0300
-Subject: PATCH Add extra search directory
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-
-diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl
-index af8531271f..66050d6cdb 100644
---- a/lib/kernel/src/code_server.erl
-+++ b/lib/kernel/src/code_server.erl
-@@ -79,11 +79,17 @@ init(Ref, Parent, Root,Mode) ->
-     IPath =
- 	case Mode of
- 	    interactive ->
--		LibDir = filename:append(Root, "lib"),
--		{ok,Dirs} = erl_prim_loader:list_dir(LibDir),
--		Paths = make_path(LibDir, Dirs),
-+		F = fun(R) ->
-+			LD = filename:append(R, "lib"),
-+			case erl_prim_loader:list_dir(LD) of
-+				    error -> ;
-+				    {ok, D} -> make_path(LD, D)
-+			end
-+		    end,
-+		Paths = F(Root),
-+		SharedPaths = F("/usr/share/erlang"),
- 		UserLibPaths = get_user_lib_dirs(),
--		"." ++ UserLibPaths ++ Paths;
-+		"." ++ UserLibPaths ++ Paths ++ SharedPaths;
- 	    _ ->
- 		
- 	end,

otp-0007-Split-off-webtool-dependency-from-tools.patch Added

@@ -0,0 +1,40 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Sat, 8 Nov 2014 22:54:57 +0300
+Subject: PATCH Split off webtool dependency from tools
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+diff --git a/lib/tools/src/cover_web.erl b/lib/tools/src/cover_web.erl
+index ae8b3f2..539ca96 100644
+--- a/lib/tools/src/cover_web.erl
++++ b/lib/tools/src/cover_web.erl
+@@ -51,14 +51,25 @@
+ %%%----------------------------------------------------------------------
+ %% Start webtool and webcover from erlang shell
+ start() ->
+-    webtool:start(),
+-    webtool:start_tools(,"app=webcover"),
++    try
++        % Disable automatic dependency picking up
++        erlang:apply(webtool, start, ),
++        erlang:apply(webtool, start_tools, ,"app=webcover")
++    catch
++        error:undef -> error_logger:error_msg("No erlang-webtool found.~nPlease install erlang-webtool package first.~n")
++    end,
+     ok.
+ 
+ %% Stop webtool and webcover from erlang shell
+ stop() ->
+-    webtool:stop_tools(,"app=webcover"),
+-    webtool:stop().
++    try
++        % Disable automatic dependency picking up
++        erlang:apply(webtool, stop_tools, ,"app=webcover"),
++        erlang:apply(webtool, stop, )
++    catch
++        error:undef -> error_logger:error_msg("No erlang-webtool found.~nPlease install erlang-webtool package first.~n")
++    end,
++    ok.
+ 
+ 
+

otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch Added

@@ -0,0 +1,30 @@
+From: John Eckersberg <jeckersb@redhat.com>
+Date: Wed, 16 Dec 2015 11:03:42 -0500
+Subject: PATCH Add patch to crash dump on large distribution
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1291822
+https://bugzilla.redhat.com/show_bug.cgi?id=1291855
+https://bugzilla.redhat.com/show_bug.cgi?id=1291856
+https://bugzilla.redhat.com/show_bug.cgi?id=1291857
+
+diff -ur otp-OTP-18.3.3.orig/erts/emulator/beam/dist.c otp-OTP-18.3.3/erts/emulator/beam/dist.c
+--- otp-OTP-18.3.3.orig/erts/emulator/beam/dist.c	2016-05-03 10:11:12.000000000 +0200
++++ otp-OTP-18.3.3/erts/emulator/beam/dist.c	2016-05-29 12:35:03.801225329 +0200
+@@ -1980,7 +1980,7 @@
+     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt));
+ 
+     if (size > (Uint) INT_MAX)
+-	erts_exit(ERTS_ABORT_EXIT,
++	erts_exit(ERTS_DUMP_EXIT,
+ 		 "Absurdly large distribution output data buffer "
+ 		 "(%beu bytes) passed.\n",
+ 		 size);
+@@ -2020,7 +2020,7 @@
+     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt));
+ 
+     if (size > (Uint) INT_MAX)
+-	erts_exit(ERTS_ABORT_EXIT,
++	erts_exit(ERTS_DUMP_EXIT,
+ 		 "Absurdly large distribution output data buffer "
+ 		 "(%beu bytes) passed.\n",
+ 		 size);

otp-0008-Avoid-forking-sed-to-get-basename.patch Deleted

otp-0009-Load-man-pages-from-system-wide-directory.patch Deleted

otp-0010-Quickfix-for-cmpxchg8b-inline-asm-when-pic-and-gcc-5.patch Added

otp-get-patches.sh Changed

@@ -17,6 +17,18 @@
 #
 # # start of autogenerated patch tag list
 # # end of autogenerated patch tag list
+# # start of autogenerated prep patch list
+# # end of autogenerated prep patch list
+#
+# The following special comment lines in the git commit messages
+# will be interpreted:
+#
+#    Fedora-Spec-Comment: This patch only applies to EL6 builds
+#    Fedora-Spec-Before: %if 0%?el6}
+#    Fedora-Spec-After: %endif
+#
+# If there is no "Fedora-Spec-Comment:" line, we will use
+# "Fedora specific patch".
 
 # Command line parsing
 otp_dir="${1:?'Fatal: otp git repo dir required'}"
@@ -37,29 +49,44 @@
 
 # Process patch files
 echo "# start of autogenerated patch tag list" > "$tmpdir/patch-list-tags.txt"
+echo "# start of autogenerated prep patch list" > "$tmpdir/patch-list-prep.txt"
 n=1
 while read patch
 do
 	otppatch="$(dirname "$patch")/otp-$(basename "$patch")"
 	${SED-sed} -e '1d' -e '/^-- $/,$d' "$patch" > "$otppatch"
 	rm -f "$patch"
+	comment="$(sed -n 's/^Fedora-Spec-Comment:\s*//p' "$otppatch")"
+	if test "x$comment" = "x"; then comment="Fedora specific patch"; fi
+	echo "# ${comment}" >> "$tmpdir/patch-list-tags.txt"
+	echo "#   $(sed -n 's/^Subject: \PATCH\ //p' "$otppatch")" >> "$tmpdir/patch-list-tags.txt"
 	echo "Patch$n: $(basename "$otppatch")" >> "$tmpdir/patch-list-tags.txt"
+	base="$(basename "$patch" ".patch" | sed 's/^000-90-9-//')"
+	backupext=".$(echo -n "$base" | tr -c -s ':alnum:' '_')"
+	sed -n 's/^Fedora-Spec-Before:\s*//p' "$otppatch" >> "$tmpdir/patch-list-prep.txt"
+	echo "%patch$n -p1 -b ${backupext}" >> "$tmpdir/patch-list-prep.txt"
+	sed -n 's/^Fedora-Spec-After:\s*//p' "$otppatch" >> "$tmpdir/patch-list-prep.txt"
 	n=$(($n + 1))
 done < "$tmpdir/patch-list.txt"
 echo "# end of autogenerated patch tag list" >> "$tmpdir/patch-list-tags.txt"
+echo "# end of autogenerated prep patch list" >> "$tmpdir/patch-list-prep.txt"
 
 # Create updated spec file
 specfile="erlang.spec"
 newspec1="${tmpdir}/${specfile}.new1"
+newspec2="${tmpdir}/${specfile}.new2"
 sed '/^# start of autogenerated patch tag list$/,$d' "$specfile" > "$newspec1"
 cat "$tmpdir/patch-list-tags.txt" >> "$newspec1"
 sed '1,/^# end of autogenerated patch tag list/d' "$specfile" >> "$newspec1"
+sed '/^# start of autogenerated prep patch list$/,$d' "$newspec1" > "$newspec2"
+cat "$tmpdir/patch-list-prep.txt" >> "$newspec2"
+sed '1,/^# end of autogenerated prep patch list/d' "$newspec1" >> "$newspec2"
 
 # Actually put all changes into git index
 git rm -f otp-00*.patch
 mv "$tmpdir/otp-00"*.patch .
 git add otp-00*.patch
-mv -f "$newspec1" "$specfile"
+mv -f "$newspec2" "$specfile"
 git add "$specfile"
 
 rm -rf "$tmpdir"

epmd.socket Changed

epmd@.socket Changed

otp-OTP-25.1.2.tar.gz -> otp-OTP-18.3.3.tar.gz Changed

otp-make-subpackages.py Changed

Build Results
RPM Lint

Refresh

Comments for request 1695 0

Request History

vanmeeuwen created request almost 8 years ago

Submit erlang

vanmeeuwen superseded request almost 8 years ago

superseded by 1705