Request 1705 (accepted)

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.

You're not reviewing the full diff of request 1705 , but the diff to the superseded request 1695 (Show full diff)

Overview

Request 1705 (accepted)

Submit erlang

Created by vanmeeuwen over 8 years ago
In state accepted
Supersedes 1695

Submit erlang

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

erlang.spec Changed

@@ -1,4 +1,25 @@
-%global bootstrap 1
+%if 0%{?opensuse_bs}
+#!BuildIgnore: systemd
+%if 0%{?rhel} > 6
+#!BuildIgnore: java-1.7.0-openjdk-devel
+%global java_devel java-1.8.0-openjdk-devel
+%else
+#!BuildIgnore: java-1.5.0-openjdk-devel
+%global java_devel java-1.6.0-openjdk-devel
+%endif
+%global java_devel_nx86 java-1.5.0-gcj-devel
+%else
+%global java_devel java-devel
+%global java_devel_nx86 java-devel
+%endif
+
+%{!?_unitdir: %global _unitdir /usr/lib/systemd/system}
+
+%global need_bootstrap_set 0
+
+%{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}}
+
+%bcond_without doc
 
 %if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7
 %global with_systemd 0
@@ -6,25 +27,17 @@
 %global with_systemd 1
 %endif
 
-%ifarch %{arm}
-# For some reason, fop hangs on arm, so for now don't generate docs by
-# default
-%bcond_with doc
-%else
-%bcond_without doc
-%endif
-
 %ifarch %{arm} %{ix86} x86_64 ppc %{power64}
 %global __with_hipe 1
 %endif
 
 Name:		erlang
-Version:	18.3.3
-Release:	1%{?dist}
+Version:	17.4
+Release:	2%{?dist}
 Summary:	General-purpose programming language and runtime environment
 
 Group:		Development/Languages
-License:	ASL 2.0
+License:	ERPL
 URL:		http://www.erlang.org
 %if 0%{?el7}%{?fedora}
 VCS:		scm:git:https://github.com/erlang/otp
@@ -34,10 +47,9 @@
 Source6:	epmd.socket
 Source7:	epmd@.service
 Source8:	epmd@.socket
-# These files are intended for Fedora package maintainers only.
-Source998:	otp-make-subpackages.py
 Source999:	otp-get-patches.sh
 
+
 # For the source of the Fedora specific patches, see the respective
 # branch at https://github.com/lemenkov/otp
 #
@@ -74,29 +86,47 @@
 # 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
+# Introduce os:getenv/2
+Patch8: otp-0008-Introduce-os-getenv-2.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
+# Patch removes support for SSLv3 protocol because it is proved
+Patch9: otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch
 # end of autogenerated patch tag list
 
 BuildRequires:	flex
+BuildRequires: gcc-c++
+BuildRequires:	lksctp-tools-devel
+BuildRequires:	m4
+BuildRequires:	ncurses-devel
+BuildRequires:	openssl-devel
+BuildRequires:	zlib-devel
+%if 0%{?with_systemd}
+BuildRequires: systemd-devel
+%endif
 
 %if %{with doc}
-%if 0%{?bootstrap} < 1
+# BEWARE. No fop for EPEL5, and only for x86/x86_64 in EPEL6, so we cannot regenerate docs here
+BuildRequires:	fop
+BuildRequires:	libxslt
+
+%if 0%{?need_bootstrap} < 1
 # Required for building docs (escript)
 BuildRequires:	erlang
 %endif
 %endif
 
+BuildRequires:	emacs
+BuildRequires:	emacs-el
+BuildRequires:	erlang-rpm-macros
+BuildRequires:	xemacs
+BuildRequires:	xemacs-packages-extra-el
+
 %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
@@ -110,11 +140,6 @@
 Requires(preun): initscripts
 %endif
 
-
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	erlang-rpm-macros
-
 Requires: %{name}-asn1%{?_isa} = %{version}-%{release}
 Requires: %{name}-common_test%{?_isa} = %{version}-%{release}
 Requires: %{name}-compiler%{?_isa} = %{version}-%{release}
@@ -174,32 +199,9 @@
 and fault tolerance. Erlang is used in several large telecommunication
 systems from Ericsson.
 
-### 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
+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}
@@ -208,15 +210,14 @@
 Provides support for Abstract Syntax Notation One.
 
 %package common_test
-Summary: A portable framework for automatic testing
-Group: Development/Languages
+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}
 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}-sasl%{?_isa} = %{version}-%{release}
 Requires: %{name}-snmp%{?_isa} = %{version}-%{release}
@@ -224,14 +225,15 @@
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
 Requires: %{name}-test_server%{?_isa} = %{version}-%{release}
 Requires: %{name}-tools%{?_isa} = %{version}-%{release}
+Requires: %{name}-webtool%{?_isa} = %{version}-%{release}
 Requires: %{name}-xmerl%{?_isa} = %{version}-%{release}
 
 %description common_test
 A portable framework for automatic testing.
 
 %package compiler
-Summary: A byte code compiler for Erlang which produces highly compact code
-Group: Development/Languages
+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}
@@ -242,8 +244,8 @@
 A byte code compiler for Erlang which produces highly compact code.
 
 %package cosEvent
-Summary: Orber OMG Event Service
-Group: Development/Languages
+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}
@@ -253,8 +255,8 @@
 Orber OMG Event Service.
 
 %package cosEventDomain
-Summary: Orber OMG Event Domain Service
-Group: Development/Languages
+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}
@@ -265,8 +267,8 @@
 Orber OMG Event Domain Service.
 
 %package cosFileTransfer
-Summary: Orber OMG File Transfer Service
-Group: Development/Languages
+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}
@@ -279,8 +281,8 @@
 Orber OMG File Transfer Service.
 
 %package cosNotification
-Summary: Orber OMG Notification Service
-Group: Development/Languages
+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}
@@ -292,8 +294,8 @@
 Orber OMG Notification Service.
 
 %package cosProperty
-Summary: Orber OMG Property Service
-Group: Development/Languages
+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}
@@ -304,8 +306,8 @@
 Orber OMG Property Service.
 
 %package cosTime
-Summary: Orber OMG Timer and TimerEvent Service
-Group: Development/Languages
+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}
@@ -316,8 +318,8 @@
 Orber OMG Timer and TimerEvent Service.
 
 %package cosTransactions
-Summary: Orber OMG Transaction Service
-Group: Development/Languages
+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}
@@ -327,9 +329,8 @@
 Orber OMG Transaction Service.
 
 %package crypto
-Summary: Cryptographical support
-Group: Development/Languages
-BuildRequires: openssl-devel
+Summary:	Cryptographical support
+Group:		Development/Languages
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
@@ -338,8 +339,8 @@
 Cryptographical support.
 
 %package debugger
-Summary: A debugger for debugging and testing of Erlang programs
-Group: Development/Languages
+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}
@@ -350,8 +351,8 @@
 A debugger for debugging and testing of Erlang programs.
 
 %package dialyzer
-Summary: A DIscrepancy AnaLYZer for ERlang programs
-Group: Development/Languages
+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}
@@ -365,9 +366,9 @@
 A DIscrepancy AnaLYZer for ERlang programs.
 
 %package diameter
-Summary: Diameter (RFC 3588) library
-Group: Development/Languages
-BuildRequires: ed
+Summary:	Diameter (RFC 3588) library
+Group:		Development/Languages
+BuildRequires:	ed
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
 Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release}
@@ -380,19 +381,17 @@
 
 %if %{with doc}
 %package doc
-Summary: Erlang documentation
-Group: Development/Languages
-BuildRequires: fop
-BuildRequires: libxslt
-BuildArch: noarch
+Summary:	Erlang documentation
+Group:		Development/Languages
+BuildArch:	noarch
 
 %description doc
 Documentation for Erlang.
 %endif
 
 %package edoc
-Summary: A utility used to generate documentation out of tags in source files
-Group: Development/Languages
+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}
@@ -404,8 +403,8 @@
 A utility used to generate documentation out of tags in source files.
 
 %package eldap
-Summary: Erlang LDAP library
-Group: Development/Languages
+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}
@@ -416,8 +415,8 @@
 Erlang LDAP library.
 
 %package erl_docgen
-Summary: A utility used to generate erlang HTML documentation
-Group: Development/Languages
+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}
@@ -427,32 +426,28 @@
 A utility used to generate erlang HTML documentation.
 
 %package erl_interface
-Summary: Low level interface to C
-Group: Development/Languages
-Requires: %{name}-erts%{?_isa} = %{version}-%{release}
+Summary:	Low level interface to C
+Group:		Development/Languages
+Requires:	%{name}-erts%{?_isa} = %{version}-%{release}
 
 %description erl_interface
 Low level interface to C.
 
 %package erts
-Summary: Functionality necessary to run the Erlang System itself
-Group: Development/Languages
-BuildRequires: lksctp-tools-devel
-BuildRequires: m4
-BuildRequires: ncurses-devel
-BuildRequires: zlib-devel
-# epmd user, epmd group
-Requires(pre): shadow-utils
+Summary:	Functionality necessary to run the Erlang System itself
+Group:		Development/Languages
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
+# This library is dlopened so it can't be picked up automatically by the RPM
+# dependency checker
 Requires: lksctp-tools
 # See erts/emulator/beam/erl_driver.h or call erlang:system_info(driver_version).
 #Provides: erlang(erl_drv_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(driver_version)).' -s erlang halt)
-Provides: erlang(erl_drv_version) = 3.3
+Provides: erlang(erl_drv_version) = 3.1
 # See erts/emulator/beam/erl_nif.h or call erlang:system_info(nif_version).
 #Provides: erlang(erl_nif_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(nif_version)).' -s erlang halt)
-Provides: erlang(erl_nif_version) = 2.10
-Provides: bundled(pcre) = 8.33
+Provides: erlang(erl_nif_version) = 2.7
+# These sub-packages were removed once
 Obsoletes: erlang-appmon
 Obsoletes: erlang-docbuilder
 Obsoletes: erlang-inviso
@@ -464,8 +459,8 @@
 Functionality necessary to run the Erlang System itself.
 
 %package et
-Summary: An event tracer for Erlang programs
-Group: Development/Languages
+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}
@@ -476,8 +471,8 @@
 An event tracer for Erlang programs.
 
 %package eunit
-Summary: Support for unit testing
-Group: Development/Languages
+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}
@@ -486,35 +481,29 @@
 Support for unit testing.
 
 %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}
-Requires: %{name}-ssl%{?_isa} = %{version}-%{release}
-Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
+Summary:	Examples for some Erlang modules
+Group:		Development/Languages
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description examples
 Examples for some Erlang modules.
 
 %package gs
-Summary: A library for Tcl/Tk support in Erlang
-Group: Development/Languages
-BuildRequires: tcl-devel
-BuildRequires: tk-devel
+Summary:	A library for Tcl/Tk support in Erlang
+Group:		Development/Languages
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
-Requires: tk
+BuildRequires:	tcl-devel
+BuildRequires:	tk-devel
+Requires:	tk
 
 %description gs
 A Graphics System used to write platform independent user interfaces.
 
 %package hipe
-Summary: High Performance Erlang
-Group: Development/Languages
+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}
@@ -525,9 +514,8 @@
 High Performance Erlang.
 
 %package ic
-Summary: IDL compiler
-Group: Development/Languages
-BuildRequires: java-devel
+Summary:	IDL compiler
+Group:		Development/Languages
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
@@ -536,30 +524,42 @@
 IDL compiler.
 
 %package inets
-Summary: A set of services such as a Web server and a ftp client etc
-Group: Development/Languages
+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}
 Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release}
 Requires: %{name}-ssl%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
+# FIXME see erlang-jinterface also
+#Requires:	jpackage-utils
 
 %description inets
 A set of services such as a Web server and a ftp client etc.
 
 %package jinterface
-Summary: A library for accessing Java from Erlang
-Group: Development/Languages
-BuildRequires: java-devel
-Requires: %{name}-erts%{?_isa} = %{version}-%{release}
+Summary:	A library for accessing Java from Erlang
+Group:		Development/Languages
+Requires:	%{name}-erts%{?_isa} = %{version}-%{release}
+# FIXME see erlang-ic also
+#Requires:	jpackage-utils
+%if 0%{?rhel} > 6 || 0%{?fedora}
+BuildRequires:	%{java_devel}
+%else
+%ifarch %{ix86} x86_64
+BuildRequires:	%{java_devel}
+%else
+BuildRequires:	%{java_devel_nx86}
+%endif
+%endif
 
 %description jinterface
 Low level interface to Java.
 
 %package kernel
-Summary: Main erlang library
-Group: Development/Languages
+Summary:	Main erlang library
+Group:		Development/Languages
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
 
@@ -567,8 +567,8 @@
 Main erlang library.
 
 %package megaco
-Summary: Megaco/H.248 support library
-Group: Development/Languages
+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}
@@ -583,8 +583,8 @@
 from media conversion.
 
 %package mnesia
-Summary: A heavy duty real-time distributed database
-Group: Development/Languages
+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}
@@ -593,8 +593,8 @@
 A heavy duty real-time distributed database.
 
 %package observer
-Summary: A set of tools for tracing and investigation of distributed systems
-Group: Development/Languages
+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}
@@ -607,20 +607,20 @@
 A set of tools for tracing and investigation of distributed systems.
 
 %package odbc
-Summary: A library for unixODBC support in Erlang
-Group: Development/Languages
-BuildRequires: unixODBC-devel
+Summary:	A library for unixODBC support in Erlang
+Group:		Development/Languages
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
+BuildRequires:	unixODBC-devel
 
 %description odbc
 An interface to relational SQL-databases built on ODBC (Open Database
 Connectivity).
 
 %package orber
-Summary: A CORBA Object Request Broker
-Group: Development/Languages
+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}
@@ -632,8 +632,8 @@
 A CORBA Object Request Broker.
 
 %package os_mon
-Summary: A monitor which allows inspection of the underlying operating system
-Group: Development/Languages
+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}
@@ -646,8 +646,8 @@
 A monitor which allows inspection of the underlying operating system.
 
 %package ose
-Summary: A module for interacting with Enea OSE
-Group: Development/Languages
+Summary:	A module for interacting with Enea OSE
+Group:		Development/Languages
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
 
@@ -655,8 +655,8 @@
 A module for interacting with Enea OSE.
 
 %package otp_mibs
-Summary: SNMP management information base for Erlang/OTP nodes
-Group: Development/Languages
+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}
@@ -667,8 +667,8 @@
 SNMP management information base for Erlang/OTP nodes.
 
 %package parsetools
-Summary: A set of parsing and lexical analysis tools
-Group: Development/Languages
+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}
@@ -677,8 +677,8 @@
 A set of parsing and lexical analysis tools.
 
 %package percept
-Summary: A concurrency profiler tool
-Group: Development/Languages
+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}
@@ -689,8 +689,8 @@
 A concurrency profiler tool.
 
 %package public_key
-Summary: API to public key infrastructure
-Group: Development/Languages
+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}
@@ -701,8 +701,8 @@
 API to public key infrastructure.
 
 %package reltool
-Summary: A release management tool
-Group: Development/Languages
+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}
@@ -719,8 +719,8 @@
 for generation of customized target systems.
 
 %package runtime_tools
-Summary: A set of tools to include in a production system
-Group: Development/Languages
+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}
@@ -730,8 +730,8 @@
 A set of tools to include in a production system.
 
 %package sasl
-Summary: The System Architecture Support Libraries
-Group: Development/Languages
+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}
@@ -742,8 +742,8 @@
 release upgrades and alarm handling etc.
 
 %package snmp
-Summary: Simple Network Management Protocol (SNMP) support
-Group: Development/Languages
+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}
@@ -756,8 +756,8 @@
 MIB compiler and tools for creating SNMP agents.
 
 %package ssh
-Summary: Secure Shell application with sftp and ssh support
-Group: Development/Languages
+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}
@@ -768,11 +768,10 @@
 Secure Shell application with sftp and ssh support.
 
 %package ssl
-Summary: Secure Socket Layer support
-Group: Development/Languages
+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}
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
 Requires: %{name}-public_key%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
@@ -781,8 +780,8 @@
 Secure Socket Layer support.
 
 %package stdlib
-Summary: The Erlang standard libraries
-Group: Development/Languages
+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}
@@ -792,9 +791,8 @@
 The Erlang standard libraries.
 
 %package syntax_tools
-Summary: A set of tools for dealing with erlang sources
-Group: Development/Languages
-Requires: %{name}-compiler%{?_isa} = %{version}-%{release}
+Summary:	A set of tools for dealing with erlang sources
+Group:		Development/Languages
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
@@ -804,23 +802,22 @@
 reading source files differently, pretty-printing syntax trees.
 
 %package test_server
-Summary: The OTP Test Server
-Group: Development/Languages
+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 test_server
 The OTP Test Server.
 
 %package tools
-Summary: A set of programming tools including a coverage analyzer etc
-Group: Development/Languages
+Summary:	A set of programming tools including a coverage analyzer etc
+Group:		Development/Languages
 Requires: %{name}-compiler%{?_isa} = %{version}-%{release}
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-inets%{?_isa} = %{version}-%{release}
@@ -833,14 +830,14 @@
 %if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
 Suggests: %{name}-webtool%{?_isa} = %{version}-%{release}
 %endif
-Provides: emacs-common-erlang = %{version}-%{release}
+Provides:	emacs-common-erlang = %{version}-%{release}
 
 %description tools
 A set of programming tools including a coverage analyzer etc.
 
 %package typer
-Summary: TYPe annotator for ERlang programs
-Group: Development/Languages
+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}
@@ -852,8 +849,8 @@
 TYPe annotator for ERlang programs.
 
 %package webtool
-Summary: A tool that simplifying the use of web based Erlang tools
-Group: Development/Languages
+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}
@@ -864,21 +861,21 @@
 A tool that simplifying the use of web based Erlang tools.
 
 %package wx
-Summary: A library for wxWidgets support in Erlang
-Group: Development/Languages
-BuildRequires: wxGTK3-devel
+Summary:	A library for wxWidgets support in Erlang
+Group:		Development/Languages
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
-Requires: mesa-libGL
-Requires: mesa-libGLU
+Requires:	mesa-libGL
+Requires:	mesa-libGLU
+BuildRequires:	wxGTK-devel
 
 %description wx
 A Graphics System used to write platform independent user interfaces.
 
 %package xmerl
-Summary: Provides support for XML 1.0
-Group: Development/Languages
+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}
@@ -886,29 +883,44 @@
 %description xmerl
 Provides support for XML 1.0.
 
+%package -n emacs-erlang
+Summary:	Compiled elisp files for erlang-mode under GNU Emacs
+Requires:	emacs-common-erlang = %{version}-%{release}
+Requires:	emacs(bin) >= %{_emacs_version}
+Group:		Applications/Editors
+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
+Requires:	emacs-erlang = %{version}-%{release}
+Group:		Applications/Editors
+BuildArch:	noarch
+
+%description -n emacs-erlang-el
+Erlang mode for GNU Emacs (source lisp files).
+
 %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
+Summary:	Compiled elisp files for erlang-mode under XEmacs
+Requires:	emacs-common-erlang = %{version}-%{release}
+Group:		Applications/Editors
+BuildArch:	noarch
+Requires:	xemacs(bin) >= %{_xemacs_version}
 
 %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
+Summary:	Elisp source files for erlang-mode under XEmacs
+Requires:	xemacs-erlang = %{version}-%{release}
+Group:		Applications/Editors
+BuildArch:	noarch
 
 %description -n xemacs-erlang-el
 Erlang mode for XEmacs (source lisp files).
 
-### END OF AUTOGENERATED LIST ###
-
 %prep
 %setup -q -n otp-OTP-%{version}
 
@@ -920,8 +932,8 @@
 %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
+%patch8 -p1 -b .Introduce_os_getenv_2
+%patch9 -p1 -b .Patch_removes_support_for_SSLv3_protocol_because_it_
 # end of autogenerated prep patch list
 
 # FIXME we should come up with a better solution
@@ -933,22 +945,25 @@
 
 
 %build
-
-# Set up proper cflags/cxxflags first
 %ifarch sparcv9 sparc64
-ERL_FLAGS="${RPM_OPT_FLAGS} -mcpu=ultrasparc -fno-strict-aliasing"
-%else
-ERL_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing"
+CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" ; export CFLAGS
+%configure \
+ --enable-shared-zlib \
+ --enable-sctp \
+%if 0%{?with_systemd}
+ --enable-systemd \
 %endif
-
-CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure \
+ %{?__with_hipe:--enable-hipe}
+%else
+CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ; export CFLAGS
+%configure \
 --enable-shared-zlib \
 --enable-sctp \
 %if 0%{?with_systemd}
 --enable-systemd \
 %endif
- %{?__with_hipe:--enable-hipe} \
- --with-wx-config=/usr/bin/wx-config-3.0
+ %{?__with_hipe:--enable-hipe}
+%endif
 
 # Remove pre-built BEAM files
 make clean
@@ -983,7 +998,7 @@
 %{_xemacs_bytecompile} *.el
 popd
 
-make %{?_smp_flags}
+make
 
 %if %{with doc}
 # should use FOP_OPTS after #832323 is resolved
@@ -1047,7 +1062,7 @@
 cd $RPM_BUILD_ROOT%{_libdir}/erlang/lib
 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}
+cp -av AUTHORS EPLICENCE 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}
@@ -1090,11 +1105,12 @@
 # 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}/"
+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"
+install -m 0755 -d "$RPM_BUILD_ROOT%{_javadir}"
 ln -s "${jinterface_lib_dir}priv/OtpErlang.jar" "$RPM_BUILD_ROOT%{_javadir}/%{name}/"
 
 # systemd-related stuff
@@ -1105,7 +1121,6 @@
 install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/epmd@.socket
 %endif
 
-
 %check
 # FIXME run tests somehow
 # make tests || exit 0
@@ -1123,7 +1138,7 @@
 %dir %{_docdir}/%{name}-%{version}/
 %doc %{_docdir}/%{name}-%{version}/AUTHORS
 %doc %{_docdir}/%{name}-%{version}/COPYRIGHT
-%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
+%doc %{_docdir}/%{name}-%{version}/EPLICENCE
 %doc %{_docdir}/%{name}-%{version}/PR.template
 %doc %{_docdir}/%{name}-%{version}/README
 %doc %{_docdir}/%{name}-%{version}/README.md
@@ -1483,6 +1498,11 @@
 
 %files examples
 %{_libdir}/erlang/lib/asn1-*/examples/
+#%{_libdir}/erlang/lib/cosFileTransfer-*/examples/
+#%{_libdir}/erlang/lib/cosNotification-*/examples/
+#%{_libdir}/erlang/lib/cosProperty-*/examples/
+#%{_libdir}/erlang/lib/cosTime-*/examples/
+#%{_libdir}/erlang/lib/cosTransactions-*/examples/
 %{_libdir}/erlang/lib/diameter-*/examples/
 %{_libdir}/erlang/lib/et-*/examples/
 %{_libdir}/erlang/lib/eunit-*/examples/
@@ -1498,6 +1518,7 @@
 %{_libdir}/erlang/lib/runtime_tools-*/examples/
 %{_libdir}/erlang/lib/sasl-*/examples/
 %{_libdir}/erlang/lib/snmp-*/examples/
+#%{_libdir}/erlang/lib/ssh-*/examples/
 %{_libdir}/erlang/lib/ssl-*/examples/
 %{_libdir}/erlang/lib/stdlib-*/examples/
 %{_libdir}/erlang/lib/syntax_tools-*/examples/
@@ -1543,7 +1564,7 @@
 %{_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_conf.*
 %{_libdir}/erlang/man/man3/httpd_socket.*
 %{_libdir}/erlang/man/man3/httpd_util.*
 %{_libdir}/erlang/man/man3/inets.*
@@ -1624,6 +1645,7 @@
 %files mnesia
 %dir %{_libdir}/erlang/lib/mnesia-*/
 %{_libdir}/erlang/lib/mnesia-*/ebin
+#%{_libdir}/erlang/lib/mnesia-*/include
 %{_libdir}/erlang/lib/mnesia-*/src
 %if %{with doc}
 %{_libdir}/erlang/man/man3/mnesia.*
@@ -1849,8 +1871,6 @@
 %{_libdir}/erlang/lib/ssl-*/src
 %if %{with doc}
 %{_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
@@ -1872,7 +1892,6 @@
 %{_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.*
@@ -1901,12 +1920,12 @@
 %{_libdir}/erlang/man/man3/ms_transform.*
 %{_libdir}/erlang/man/man3/orddict.*
 %{_libdir}/erlang/man/man3/ordsets.*
+%{_libdir}/erlang/man/man3/pg.*
 %{_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.*
@@ -1927,7 +1946,6 @@
 %files syntax_tools
 %dir %{_libdir}/erlang/lib/syntax_tools-*/
 %{_libdir}/erlang/lib/syntax_tools-*/ebin
-%{_libdir}/erlang/lib/syntax_tools-*/include
 %if %{with doc}
 %{_libdir}/erlang/man/man3/epp_dodger.*
 %{_libdir}/erlang/man/man3/erl_comment_scan.*
@@ -1937,8 +1955,6 @@
 %{_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
 
@@ -1976,6 +1992,7 @@
 %{_libdir}/erlang/erts-*/bin/typer
 %dir %{_libdir}/erlang/lib/typer-*/
 %{_libdir}/erlang/lib/typer-*/ebin/
+#%{_libdir}/erlang/lib/typer-*/src/
 
 %files webtool
 %{_libdir}/erlang/lib/webtool-*/
@@ -2006,7 +2023,6 @@
 %{_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.*
@@ -2043,7 +2059,6 @@
 %{_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.*
@@ -2130,7 +2145,6 @@
 %{_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.*
@@ -2138,7 +2152,6 @@
 %{_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.*
@@ -2254,46 +2267,6 @@
 
 
 %changelog
-* Sun Feb 28 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.2.4-2
-- Fixed issue with nodes registration over IPv6
-
-* Tue Feb 23 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.2.4-1
-- Ver. 18.2.4
-- Build against wxGTK-3.x.y as recommended by upstream. This change won't
- affect "headless" installations.
-
-* Fri Feb 19 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.2.3-3
-- Add missing dependency
-
-* Wed Feb 10 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.2.3-2
-- Workaround for broken cmpxchg8b inlining on ix86 (rhbz#1240487)
-- Don't use generic optimization on ix86
-- Increase memory up to 1024 mbytes while generating docs on non-ppc arches
-
-* Tue Feb 9 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.2.3-1
-- Ver. 18.2.3
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 18.2.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jan 22 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.2.2-3
-- Disable optimizations for Intel Atom CPU on ix86 arches
-
-* Sun Jan 17 2016 John Eckersberg <eck@redhat.com> - 18.2.2-2
-- Add patch for epmd ipv6 support (rhbz#1299253)
-
-* Mon Jan 11 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.2.2-1
-- Ver. 18.2.2
-
-* Tue Aug 18 2015 John Eckersberg <eck@redhat.com> - 17.4-5
-- Disable docs by default on ARM until I figure out why fop hangs
-
-* Wed Aug 5 2015 John Eckersberg <eck@redhat.com> - 17.4-4
-- Add patch for CVE-2015-2774 - TLS-1.0 POODLE vulnerability (rhbz#1206712)
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 17.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
 * Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 17.4-2
 - Rebuilt for GCC 5 C++11 ABI change

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 8e55fa7..9512faa 100644
+index 0cf965f..94e82a8 100644
 --- a/erts/etc/common/Makefile.in
 +++ b/erts/etc/common/Makefile.in
-@@ -551,10 +551,6 @@ endif
+@@ -550,10 +550,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 6634ae3..fa18956 100644
+index 8eb1db7..9e340bb 100644
 --- a/erts/etc/unix/Install.src
 +++ b/erts/etc/unix/Install.src
-@@ -141,14 +141,5 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot .
+@@ -140,14 +140,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

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

@@ -14,10 +14,10 @@
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
-index 2b72e1a..0522562 100644
+index a7cd03f..6da4d75 100644
 --- a/lib/asn1/c_src/Makefile
 +++ b/lib/asn1/c_src/Makefile
-@@ -143,8 +143,6 @@ release_spec: opt
+@@ -142,8 +142,6 @@ release_spec: opt
 ifneq ($(findstring ose,$(TARGET)),ose)
 	$(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) "$(RELSYSDIR)/priv/lib"
 endif
@@ -27,10 +27,10 @@
 release_docs_spec:
 
 diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
-index 574cdf5..428c316 100644
+index 5b36c19..470821e 100644
 --- a/lib/crypto/c_src/Makefile.in
 +++ b/lib/crypto/c_src/Makefile.in
-@@ -200,14 +200,10 @@ docs:
+@@ -199,14 +199,10 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
@@ -46,10 +46,10 @@
 endif
 endif
 diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
-index 777d709..57917ae 100644
+index 7c09b60..2c14f9e 100644
 --- a/lib/erl_interface/src/Makefile.in
 +++ b/lib/erl_interface/src/Makefile.in
-@@ -905,14 +905,14 @@ ifneq ($(EXE_TARGETS),)
+@@ -904,14 +904,14 @@ ifneq ($(EXE_TARGETS),)
 	$(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"
 endif
 	$(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src"
@@ -73,10 +73,10 @@
 release_docs:
 
 diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in
-index b9f92a0..9612f24 100644
+index ed860ab..96206ae 100644
 --- a/lib/ic/c_src/Makefile.in
 +++ b/lib/ic/c_src/Makefile.in
-@@ -145,12 +145,10 @@ $(OBJDIR)/%.o: %.c
+@@ -144,12 +144,10 @@ $(OBJDIR)/%.o: %.c
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
@@ -90,10 +90,10 @@
 	$(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 045b6d8..39be02a 100644
+index 6111cf2..bd62e8b 100644
 --- a/lib/megaco/src/flex/Makefile.in
 +++ b/lib/megaco/src/flex/Makefile.in
-@@ -271,7 +271,7 @@ release_spec: opt
+@@ -270,7 +270,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)
@@ -103,10 +103,10 @@
 endif
 
 diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in
-index 685eb5d..6c8a432 100644
+index 6572d28..c7093ae 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
+@@ -128,11 +128,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 ifdef EXE_TARGET
@@ -119,10 +119,10 @@
 endif
 
 diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in
-index e9fc5f4..ac9fb73 100644
+index f84ccf7..05d194f 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
+@@ -125,8 +125,6 @@ $(OBJDIR)/memsup.o: memsup.h
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
@@ -132,10 +132,10 @@
 	$(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
+index d46b499..4309aae 100644
 --- a/lib/runtime_tools/c_src/Makefile.in
 +++ b/lib/runtime_tools/c_src/Makefile.in
-@@ -157,10 +157,8 @@ docs:
+@@ -156,10 +156,8 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
@@ -147,10 +147,10 @@
 endif
 
 diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
-index 66bba22..eea37fc 100644
+index b1eb69f..1acfdbf 100644
 --- a/lib/tools/c_src/Makefile.in
 +++ b/lib/tools/c_src/Makefile.in
-@@ -198,8 +198,6 @@ include ../vsn.mk
+@@ -197,8 +197,6 @@ include ../vsn.mk
 RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN)
 
 release_spec: all

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

@@ -5,10 +5,10 @@
 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
+index 273614e..5b1fb57 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:
+@@ -112,8 +112,6 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
@@ -18,10 +18,10 @@
 	$(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 1c8364e..34b64a8 100644
+index ea3ab77..e95757e 100644
 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
 +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
-@@ -120,8 +120,6 @@ release release_docs release_tests release_html:
+@@ -119,8 +119,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 0c5acd9..5f8f1e3 100644
+index 08fd23e..5606cfc 100644
 --- a/lib/os_mon/doc/src/Makefile
 +++ b/lib/os_mon/doc/src/Makefile
-@@ -36,12 +36,17 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
+@@ -35,12 +35,17 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 # Target Specs
 # ----------------------------------------------------
 XML_APPLICATION_FILES = ref_man.xml
@@ -29,10 +29,10 @@
 XML_REF6_FILES = os_mon_app.xml 
 
 diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile
-index 9aa068c..1003d24 100644
+index cd2dade..4e78cf8 100644
 --- a/lib/os_mon/src/Makefile
 +++ b/lib/os_mon/src/Makefile
-@@ -34,8 +34,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN)
+@@ -33,8 +33,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN)
 # ----------------------------------------------------
 # Target Specs
 # ----------------------------------------------------
@@ -47,7 +47,7 @@
 
 INCLUDE=../include
 CSRC=../c_src
-@@ -79,7 +84,11 @@ docs:
+@@ -78,7 +83,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 52034a0..56d91b9 100644
+index 4ea2d41..e1466c1 100644
 --- a/erts/preloaded/src/Makefile
 +++ b/erts/preloaded/src/Makefile
-@@ -86,8 +86,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk
+@@ -85,8 +85,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 5b34017..d4677d6 100644
+index 6798da0..4e3ae0e 100644
 --- a/lib/asn1/src/Makefile
 +++ b/lib/asn1/src/Makefile
-@@ -155,7 +155,7 @@ release_spec: opt
+@@ -154,7 +154,7 @@ release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -34,10 +34,10 @@
 	$(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples"
 
 diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile
-index 987345c..f53546a 100644
+index 8d74546..a25d85d 100644
 --- a/lib/common_test/src/Makefile
 +++ b/lib/common_test/src/Makefile
-@@ -144,7 +144,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -140,7 +140,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -47,10 +47,10 @@
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile
-index 299b289..36a048b 100644
+index c6d09d8..46dcdf4 100644
 --- a/lib/compiler/src/Makefile
 +++ b/lib/compiler/src/Makefile
-@@ -172,8 +172,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -165,8 +165,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -62,10 +62,10 @@
 	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
 
 diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile
-index b79f0ec..30d1a1d 100644
+index 2864ee0..0e27bb6 100644
 --- a/lib/cosEvent/src/Makefile
 +++ b/lib/cosEvent/src/Makefile
-@@ -203,7 +203,7 @@ release_spec: opt
+@@ -202,7 +202,7 @@ release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -75,10 +75,10 @@
 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
 
 diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile
-index da8dcf0..88b3993 100644
+index b4b74bd..420f566 100644
 --- a/lib/cosEventDomain/src/Makefile
 +++ b/lib/cosEventDomain/src/Makefile
-@@ -172,7 +172,7 @@ release_spec: opt
+@@ -171,7 +171,7 @@ release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -88,10 +88,10 @@
 	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include"
 
 diff --git a/lib/cosFileTransfer/src/Makefile b/lib/cosFileTransfer/src/Makefile
-index f9107ff..74d337d 100644
+index 9d3abb9..c3d83a5 100644
 --- a/lib/cosFileTransfer/src/Makefile
 +++ b/lib/cosFileTransfer/src/Makefile
-@@ -180,9 +180,7 @@ release_spec: opt
+@@ -179,9 +179,7 @@ release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -103,10 +103,10 @@
 
 release_docs_spec:
 diff --git a/lib/cosNotification/src/Makefile b/lib/cosNotification/src/Makefile
-index 72b063f..0fdb82e 100644
+index 13153bd..0860700 100644
 --- a/lib/cosNotification/src/Makefile
 +++ b/lib/cosNotification/src/Makefile
-@@ -371,8 +371,7 @@ release_spec: opt
+@@ -370,8 +370,7 @@ release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -117,10 +117,10 @@
 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
 
 diff --git a/lib/cosProperty/src/Makefile b/lib/cosProperty/src/Makefile
-index cd559e1..bdf035e 100644
+index d7b75d8..fba8746 100644
 --- a/lib/cosProperty/src/Makefile
 +++ b/lib/cosProperty/src/Makefile
-@@ -180,8 +180,7 @@ release_spec: opt
+@@ -179,8 +179,7 @@ release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -131,10 +131,10 @@
 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
 
 diff --git a/lib/cosTime/src/Makefile b/lib/cosTime/src/Makefile
-index 7a14db6..4b55398 100644
+index 0ab2b41..c29caeb 100644
 --- a/lib/cosTime/src/Makefile
 +++ b/lib/cosTime/src/Makefile
-@@ -199,8 +199,7 @@ release_spec: opt
+@@ -198,8 +198,7 @@ release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -145,10 +145,10 @@
 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
 
 diff --git a/lib/cosTransactions/src/Makefile b/lib/cosTransactions/src/Makefile
-index 90e1e51..05826e0 100644
+index 7b4a9cf..290707c 100644
 --- a/lib/cosTransactions/src/Makefile
 +++ b/lib/cosTransactions/src/Makefile
-@@ -174,7 +174,7 @@ release_spec: opt
+@@ -173,7 +173,7 @@ release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -158,10 +158,10 @@
 	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include"
 
 diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile
-index 6e4008e..c2d00fc 100644
+index c185c15..68bacba 100644
 --- a/lib/crypto/src/Makefile
 +++ b/lib/crypto/src/Makefile
-@@ -82,8 +82,6 @@ docs:
+@@ -81,8 +81,6 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
@@ -171,10 +171,10 @@
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \
 		$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile
-index f115f49..e7dc360 100644
+index d61519f..bfdb0c9 100644
 --- a/lib/debugger/src/Makefile
 +++ b/lib/debugger/src/Makefile
-@@ -117,7 +117,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -116,7 +116,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -184,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 770af21..4f8a6d8 100644
+index 91fbdca..01fb30c 100644
 --- a/lib/dialyzer/src/Makefile
 +++ b/lib/dialyzer/src/Makefile
-@@ -152,7 +152,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -151,7 +151,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -197,10 +197,10 @@
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
 diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
-index e0bbbdf..10771b2 100644
+index 9afccf2..107d65b 100644
 --- a/lib/diameter/src/Makefile
 +++ b/lib/diameter/src/Makefile
-@@ -251,11 +251,8 @@ release_spec: opt
+@@ -250,11 +250,8 @@ release_spec: opt
 	$(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%)
 
 $(TARGET_DIRS:%/=release_src_%): release_src_%:
@@ -228,10 +228,10 @@
 release_docs_spec:
 
 diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile
-index cd3c102..b55c513 100644
+index 2e1110e..b7f9b09 100644
 --- a/lib/eldap/src/Makefile
 +++ b/lib/eldap/src/Makefile
-@@ -99,10 +99,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -98,10 +98,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
@@ -243,10 +243,10 @@
 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
 
 diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile
-index 7d41506..3f3562f 100644
+index ef96f5d..d9a2f0d 100644
 --- a/lib/erl_docgen/src/Makefile
 +++ b/lib/erl_docgen/src/Makefile
-@@ -90,8 +90,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+@@ -89,8 +89,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
@@ -256,10 +256,10 @@
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile
-index 461a52d..1f2e885 100644
+index 377e593..668e278 100644
 --- a/lib/et/src/Makefile
 +++ b/lib/et/src/Makefile
-@@ -109,7 +109,6 @@ release_spec: opt
+@@ -108,7 +108,6 @@ release_spec: opt
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -268,7 +268,7 @@
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
 diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile
-index 86a6d88..5732fd8 100644
+index 47aef10..78ddc74 100644
 --- a/lib/eunit/src/Makefile
 +++ b/lib/eunit/src/Makefile
 @@ -120,7 +120,6 @@ release_spec: opt
@@ -280,10 +280,10 @@
 	$(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
+index f0200ca..86d3f74 100644
 --- a/lib/gs/src/Makefile
 +++ b/lib/gs/src/Makefile
-@@ -109,8 +109,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -108,8 +108,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -295,10 +295,10 @@
 	$(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
+index d13dfb3..b09d62b 100644
 --- a/lib/hipe/cerl/Makefile
 +++ b/lib/hipe/cerl/Makefile
-@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/cerl"
@@ -308,10 +308,10 @@
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 diff --git a/lib/hipe/flow/Makefile b/lib/hipe/flow/Makefile
-index f0af6ac..16b512e 100644
+index 75e156b..5e394ca 100644
 --- a/lib/hipe/flow/Makefile
 +++ b/lib/hipe/flow/Makefile
-@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/flow"
@@ -321,10 +321,10 @@
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 diff --git a/lib/hipe/icode/Makefile b/lib/hipe/icode/Makefile
-index a82e28c..f364a53 100644
+index 87015aa..84f870d 100644
 --- a/lib/hipe/icode/Makefile
 +++ b/lib/hipe/icode/Makefile
-@@ -120,7 +120,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -119,7 +119,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/icode"
@@ -334,10 +334,10 @@
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 diff --git a/lib/hipe/llvm/Makefile b/lib/hipe/llvm/Makefile
-index f6f6f6b..4369923 100644
+index 92f3789..82f3e77 100644
 --- a/lib/hipe/llvm/Makefile
 +++ b/lib/hipe/llvm/Makefile
-@@ -103,7 +103,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/llvm
@@ -347,10 +347,10 @@
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
 
 diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile
-index d44be2d..ed81f10 100644
+index 66e4c3e..2f11670 100644
 --- a/lib/hipe/main/Makefile
 +++ b/lib/hipe/main/Makefile
-@@ -118,7 +118,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -117,7 +117,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DATA) ../vsn.mk "$(RELSYSDIR)"
 	$(INSTALL_DIR) "$(RELSYSDIR)/main"
@@ -360,10 +360,10 @@
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 diff --git a/lib/hipe/misc/Makefile b/lib/hipe/misc/Makefile
-index be5c9bc..d40b322 100644
+index 16166f5..0ba5845 100644
 --- a/lib/hipe/misc/Makefile
 +++ b/lib/hipe/misc/Makefile
-@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/misc"
@@ -373,10 +373,10 @@
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile
-index 1bf52fe..5049bec 100644
+index 751e876..98b7911 100644
 --- a/lib/hipe/rtl/Makefile
 +++ b/lib/hipe/rtl/Makefile
-@@ -105,7 +105,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -104,7 +104,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/rtl"
@@ -386,10 +386,10 @@
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 diff --git a/lib/hipe/util/Makefile b/lib/hipe/util/Makefile
-index 4a78ad7..1b1ce05 100644
+index a5ee232..f03e41d 100644
 --- a/lib/hipe/util/Makefile
 +++ b/lib/hipe/util/Makefile
-@@ -50,7 +50,6 @@ HIPE_MODULES =
+@@ -49,7 +49,6 @@ HIPE_MODULES =
 endif
 MODULES = hipe_timing hipe_dot hipe_digraph $(HIPE_MODULES)
 
@@ -397,7 +397,7 @@
 ERL_FILES= $(MODULES:%=%.erl)
 TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 DOC_FILES= $(MODULES:%=$(DOCS)/%.html)
-@@ -104,8 +103,6 @@ $(DOCS)/%.html:%.erl
+@@ -103,8 +102,6 @@ $(DOCS)/%.html:%.erl
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
@@ -407,10 +407,10 @@
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 diff --git a/lib/ic/src/Makefile b/lib/ic/src/Makefile
-index a6da81a..60870be 100644
+index e8769d2..965d0e7 100644
 --- a/lib/ic/src/Makefile
 +++ b/lib/ic/src/Makefile
-@@ -200,7 +200,7 @@ release_spec: opt
+@@ -199,7 +199,7 @@ release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -420,10 +420,10 @@
 	$(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
+index 2c3d2b6..de0450e 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
+@@ -90,7 +90,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/ftp"
@@ -433,10 +433,10 @@
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile
-index cb97b52..cb13dfb 100644
+index f0d4ce1..35c4ffc 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
+@@ -91,7 +91,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/http_client"
@@ -446,10 +446,10 @@
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile
-index 4a4eef9..c779c8e 100644
+index 51167b3..a623824 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
+@@ -89,7 +89,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/http_lib"
@@ -459,23 +459,23 @@
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile
-index 1c05d45..88f9f62 100644
+index 2660d04..c873a27 100644
 --- a/lib/inets/src/http_server/Makefile
 +++ b/lib/inets/src/http_server/Makefile
-@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -126,7 +126,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/http_server"
 -	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_server"
 +	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_server"
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile
-index 0a4b625..1b1d83d 100644
+index 22426ee..0b0cfb8 100644
 --- a/lib/inets/src/inets_app/Makefile
 +++ b/lib/inets/src/inets_app/Makefile
-@@ -115,7 +115,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -113,7 +113,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/inets_app"
@@ -485,10 +485,10 @@
 	$(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
+index b368b12..5eddaf0 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
+@@ -95,7 +95,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/tftp"
@@ -498,10 +498,10 @@
 	$(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
-index 57daceb..1cebd80 100644
+index c7c70ad..3e1792f 100644
 --- a/lib/kernel/src/Makefile
 +++ b/lib/kernel/src/Makefile
-@@ -200,7 +200,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -199,7 +199,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -510,10 +510,10 @@
 	$(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 8f8e6ec..9e0bc82 100644
+index d18da53..4a9f4d2 100644
 --- a/lib/megaco/src/app/Makefile
 +++ b/lib/megaco/src/app/Makefile
-@@ -114,7 +114,7 @@ release_spec: opt
+@@ -113,7 +113,7 @@ release_spec: opt
 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/app"
@@ -523,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 711fbb7..1db4593 100644
+index c1fd66b..0699ffa 100644
 --- a/lib/megaco/src/binary/Makefile
 +++ b/lib/megaco/src/binary/Makefile
-@@ -176,7 +176,7 @@ release_spec: opt
+@@ -175,7 +175,7 @@ release_spec: opt
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/binary"
@@ -536,10 +536,10 @@
 
 release_docs_spec:
 diff --git a/lib/megaco/src/engine/Makefile b/lib/megaco/src/engine/Makefile
-index 208942c..d5b7218 100644
+index 7cecef1..841a88a 100644
 --- a/lib/megaco/src/engine/Makefile
 +++ b/lib/megaco/src/engine/Makefile
-@@ -102,7 +102,7 @@ release_spec: opt
+@@ -101,7 +101,7 @@ release_spec: opt
 	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/engine"
@@ -549,22 +549,23 @@
 
 
 diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
-index 39be02a..8c6ba31 100644
+index bd62e8b..cce5a8d 100644
 --- a/lib/megaco/src/flex/Makefile.in
 +++ b/lib/megaco/src/flex/Makefile.in
-@@ -268,7 +268,6 @@ release_spec: opt
+@@ -267,8 +267,6 @@ release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/flex"
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 -	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+-	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)
 	$(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex"
+ 	$(INSTALL_PROGRAM) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
 diff --git a/lib/megaco/src/tcp/Makefile b/lib/megaco/src/tcp/Makefile
-index 0c546a8..78f659a 100644
+index 0c30aba..aa553ff 100644
 --- a/lib/megaco/src/tcp/Makefile
 +++ b/lib/megaco/src/tcp/Makefile
-@@ -94,7 +94,7 @@ release_spec: opt
+@@ -93,7 +93,7 @@ release_spec: opt
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/tcp"
@@ -574,10 +575,10 @@
 
 release_docs_spec:
 diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile
-index f4fc56a..1cc73fd 100644
+index cab4256..d5cf217 100644
 --- a/lib/megaco/src/text/Makefile
 +++ b/lib/megaco/src/text/Makefile
-@@ -135,7 +135,7 @@ release_spec: opt
+@@ -134,7 +134,7 @@ release_spec: opt
 	$(INSTALL_DATA) $(BEAM_TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/text"
@@ -587,10 +588,10 @@
 
 release_docs_spec:
 diff --git a/lib/megaco/src/udp/Makefile b/lib/megaco/src/udp/Makefile
-index 7288c20..aefd9f3 100644
+index 9486804..ea4830c 100644
 --- a/lib/megaco/src/udp/Makefile
 +++ b/lib/megaco/src/udp/Makefile
-@@ -94,7 +94,7 @@ release_spec: opt
+@@ -93,7 +93,7 @@ release_spec: opt
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/udp"
@@ -600,10 +601,10 @@
 
 release_docs_spec:
 diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile
-index dae0df7..6294ae9 100644
+index ac38fa0..20bce7e 100644
 --- a/lib/mnesia/src/Makefile
 +++ b/lib/mnesia/src/Makefile
-@@ -133,7 +133,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"
@@ -613,10 +614,10 @@
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
-index 2d42510..7579014 100644
+index c120865..6831d23 100644
 --- a/lib/observer/src/Makefile
 +++ b/lib/observer/src/Makefile
-@@ -152,7 +152,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -149,7 +149,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -625,10 +626,10 @@
 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
 	$(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples"
 diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile
-index 51c9ed3..50a4c10 100644
+index bfbda8a..6e4ad54 100644
 --- a/lib/odbc/src/Makefile
 +++ b/lib/odbc/src/Makefile
-@@ -110,7 +110,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -109,7 +109,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -638,10 +639,10 @@
 	$(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
+index 8140620..73df530 100644
 --- a/lib/orber/COSS/CosNaming/Makefile
 +++ b/lib/orber/COSS/CosNaming/Makefile
-@@ -145,8 +145,8 @@ release_spec: opt
+@@ -144,8 +144,8 @@ release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/COSS/CosNaming"
@@ -653,10 +654,10 @@
 
 release_docs_spec:
 diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile
-index 30b74c4..9c6708f 100644
+index 398e481..f079e77 100644
 --- a/lib/orber/src/Makefile
 +++ b/lib/orber/src/Makefile
-@@ -253,7 +253,7 @@ release_spec: opt
+@@ -252,7 +252,7 @@ release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -666,10 +667,10 @@
 	$(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 1003d24..1b12154 100644
+index 4e78cf8..69d434c 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
+@@ -104,7 +104,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -678,10 +679,10 @@
 	$(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
+index 88f8957..ab08a88 100644
 --- a/lib/ose/src/Makefile
 +++ b/lib/ose/src/Makefile
-@@ -94,9 +94,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+@@ -93,9 +93,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
@@ -692,10 +693,10 @@
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile
-index 03892cd..c3ad326 100644
+index 6096240..cbc41e6 100644
 --- a/lib/otp_mibs/src/Makefile
 +++ b/lib/otp_mibs/src/Makefile
-@@ -96,8 +96,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+@@ -95,8 +95,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
@@ -705,10 +706,10 @@
 	$(INSTALL_DATA) $(TARGETS) "$(RELSYSDIR)/ebin"
 
 diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile
-index dbecdd2..1d45801 100644
+index 2ee2285..ea075ed 100644
 --- a/lib/parsetools/src/Makefile
 +++ b/lib/parsetools/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
@@ -718,10 +719,10 @@
 	$(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
+index 0282d63..5902da3 100644
 --- a/lib/percept/src/Makefile
 +++ b/lib/percept/src/Makefile
-@@ -97,7 +97,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -96,7 +96,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -730,10 +731,10 @@
 #	$(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 7474297..a510658 100644
+index c1b3bc8..3d021cf 100644
 --- a/lib/public_key/asn1/Makefile
 +++ b/lib/public_key/asn1/Makefile
-@@ -96,8 +96,8 @@ release_spec: opt
+@@ -95,8 +95,8 @@ release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
 	$(INSTALL_DIR) "$(RELSYSDIR)/asn1"
@@ -745,10 +746,19 @@
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile
-index 786f244..0463c67 100644
+index 09393e8..eb4c54d 100644
 --- a/lib/public_key/src/Makefile
 +++ b/lib/public_key/src/Makefile
-@@ -109,8 +109,6 @@ $(APPUP_TARGET):	$(APPUP_SRC) ../vsn.mk
+@@ -49,8 +49,6 @@ MODULES = \
+ 
+ HRL_FILES = $(INCLUDE)/public_key.hrl 
+ 
+-INTERNAL_HRL_FILES = 
+-
+ ERL_FILES = $(MODULES:%=%.erl)
+ 
+ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+@@ -103,8 +101,6 @@ $(APPUP_TARGET):	$(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
@@ -758,10 +768,10 @@
 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 diff --git a/lib/reltool/src/Makefile b/lib/reltool/src/Makefile
-index 1fea415..a756470 100644
+index b8387ff..2012af9 100644
 --- a/lib/reltool/src/Makefile
 +++ b/lib/reltool/src/Makefile
-@@ -100,7 +100,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -99,7 +99,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -771,10 +781,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 99b90f9..25b3ebb 100644
+index 8d2bcfe..d1a9cac 100644
 --- a/lib/runtime_tools/src/Makefile
 +++ b/lib/runtime_tools/src/Makefile
-@@ -97,8 +97,6 @@ docs:
+@@ -96,8 +96,6 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
@@ -784,10 +794,10 @@
 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
 diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile
-index 7ff6a03..a304900 100644
+index ab2d3a3..bb53a67 100644
 --- a/lib/sasl/src/Makefile
 +++ b/lib/sasl/src/Makefile
-@@ -93,7 +93,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -92,7 +92,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -796,10 +806,10 @@
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile
-index 89037b3..01de885 100644
+index beed696..752072d 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
+@@ -130,7 +130,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/agent"
@@ -809,10 +819,10 @@
 	$(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 7972d95..78a9f2b 100644
+index b8cc4b8..d806efb 100644
 --- a/lib/snmp/src/app/Makefile
 +++ b/lib/snmp/src/app/Makefile
-@@ -132,7 +132,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -131,7 +131,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/app"
@@ -822,10 +832,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 54f2e22..488faa4 100644
+index f63fc18..9759451 100644
 --- a/lib/snmp/src/compile/Makefile
 +++ b/lib/snmp/src/compile/Makefile
-@@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -122,7 +122,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/compiler"
@@ -835,10 +845,10 @@
 	$(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 382f83b..db50c26 100644
+index c76dbac..548823a 100644
 --- a/lib/snmp/src/manager/Makefile
 +++ b/lib/snmp/src/manager/Makefile
-@@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -113,7 +113,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/manager"
@@ -848,10 +858,10 @@
 	$(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 c71ecf9..d17e699 100644
+index 698c341..3344a0c 100644
 --- a/lib/snmp/src/misc/Makefile
 +++ b/lib/snmp/src/misc/Makefile
-@@ -112,7 +112,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -111,7 +111,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/misc"
@@ -861,7 +871,7 @@
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 # 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
-index b44c8ee..8f8b58d 100644
+index 90d7110..e725c6c 100644
 --- a/lib/ssh/src/Makefile
 +++ b/lib/ssh/src/Makefile
 @@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
@@ -874,10 +884,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 790328d..db08822 100644
+index 0c00a65..acec405 100644
 --- a/lib/ssl/src/Makefile
 +++ b/lib/ssl/src/Makefile
-@@ -141,7 +141,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -137,7 +137,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -887,10 +897,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 9f4a446..50ac11e 100644
+index 9ab2cd4..876bfd2 100644
 --- a/lib/stdlib/src/Makefile
 +++ b/lib/stdlib/src/Makefile
-@@ -207,7 +207,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -203,7 +203,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -899,23 +909,23 @@
 	$(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 2e91adf..0085fca 100644
+index c9fbad8..2fc7f18 100644
 --- a/lib/syntax_tools/src/Makefile
 +++ b/lib/syntax_tools/src/Makefile
-@@ -100,8 +100,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -82,8 +82,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin"
 -	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 -	$(INSTALL_DATA) $(SOURCES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include"
+ 
+ release_docs_spec:
 
 diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile
-index 6a26ee2..7336477 100644
+index 35bbad3..deb7caf 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
+@@ -123,7 +123,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -924,10 +934,10 @@
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
 diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile
-index 9fcfb79..b30b173 100644
+index e606b97..1beb8cc 100644
 --- a/lib/tools/src/Makefile
 +++ b/lib/tools/src/Makefile
-@@ -107,7 +107,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -106,7 +106,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -937,10 +947,10 @@
 	$(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
+index a7059de..0b1ae2a 100644
 --- a/lib/typer/src/Makefile
 +++ b/lib/typer/src/Makefile
-@@ -102,9 +102,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+@@ -101,9 +101,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
@@ -951,10 +961,10 @@
 	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
 
 diff --git a/lib/webtool/src/Makefile b/lib/webtool/src/Makefile
-index a5a8eaf..be80ba7 100644
+index af565c8..6c65b26 100644
 --- a/lib/webtool/src/Makefile
 +++ b/lib/webtool/src/Makefile
-@@ -88,8 +88,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+@@ -87,8 +87,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
@@ -964,10 +974,10 @@
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
 		"$(RELSYSDIR)/ebin"
 diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile
-index b345e34..153a270 100644
+index 26574ed..266a5d6 100644
 --- a/lib/wx/src/Makefile
 +++ b/lib/wx/src/Makefile
-@@ -122,9 +122,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES)
+@@ -121,9 +121,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES)
 include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt 
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -980,10 +990,10 @@
 	$(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include"
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile
-index f8f0320..099513e 100644
+index d5ce3fe..e21e4b1 100644
 --- a/lib/xmerl/src/Makefile
 +++ b/lib/xmerl/src/Makefile
-@@ -218,9 +218,7 @@ release_spec: opt
+@@ -217,9 +217,7 @@ release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"

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

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

@@ -1,30 +0,0 @@
-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-Introduce-os-getenv-2.patch Added

@@ -0,0 +1,63 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Sat, 8 Nov 2014 15:11:04 +0300
+Subject: [PATCH] Introduce os:getenv/2
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml
+index 2b57e75..8b85f24 100644
+--- a/lib/kernel/doc/src/os.xml
++++ b/lib/kernel/doc/src/os.xml
+@@ -100,6 +100,19 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
+ </desc>
+ </func>
+ <func>
++ <name name="getenv" arity="2"/>
++ <fsummary>Get the value of an environment variable</fsummary>
++ <desc>
++ Returns the <c><anno>Value</anno></c> of the environment variable
++ <c><anno>VarName</anno></c>, or <c>DefaultValue</c> if the environment variable
++ is undefined.
++	If Unicode file name encoding is in effect (see the <seealso
++	marker="erts:erl#file_name_encoding">erl manual
++	page</seealso>), the strings (both <c><anno>VarName</anno></c> and
++	<c><anno>Value</anno></c>) may contain characters with codepoints > 255.
++ </desc>
++ </func>
++ <func>
+ <name name="getpid" arity="0"/>
+ <fsummary>Return the process identifier of the emulator process</fsummary>
+ <desc>
+diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl
+index 187fd00..8aaf13b 100644
+--- a/lib/kernel/src/os.erl
++++ b/lib/kernel/src/os.erl
+@@ -26,7 +26,7 @@
+ 
+ %%% BIFs
+ 
+--export([getenv/0, getenv/1, getpid/0, putenv/2, timestamp/0, unsetenv/1]).
++-export([getenv/0, getenv/1, getenv/2, getpid/0, putenv/2, timestamp/0, unsetenv/1]).
+ 
+ -spec getenv() -> [string()].
+ 
+@@ -39,6 +39,19 @@ getenv() -> erlang:nif_error(undef).
+ getenv(_) ->
+ erlang:nif_error(undef).
+ 
++-spec getenv(VarName, DefaultValue) -> Value when
++ VarName :: string(),
++ DefaultValue :: string(),
++ Value :: string().
++
++getenv(VarName, DefaultValue) ->
++ case os:getenv(VarName) of
++ false ->
++ DefaultValue;
++ Value ->
++ Value
++ end.
++
+ -spec getpid() -> Value when
+ Value :: string().
+

otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch Added

@@ -0,0 +1,100 @@
+From: Sergei Golovan <sgolovan@debian.org>
+Date: Sun, 30 Nov 2014 20:20:41 +0300
+Subject: [PATCH] Patch removes support for SSLv3 protocol because it is proved
+ to be insecure and nobody should use it anymore.
+
+
+diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
+index b53344e..b245621 100644
+--- a/lib/ssl/doc/src/ssl.xml
++++ b/lib/ssl/doc/src/ssl.xml
+@@ -123,7 +123,7 @@
+ 
+ <c>sslsocket() - opaque to the user. </c>
+ 
+- <c>protocol() = sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2' </c>
++ <c>protocol() = tlsv1 | 'tlsv1.1' | 'tlsv1.2' </c>
+ 
+ <c>ciphers() = [ciphersuite()] | string() (according to old API)</c>
+ 
+diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml
+index 43cb393..ff12e04 100644
+--- a/lib/ssl/doc/src/ssl_app.xml
++++ b/lib/ssl/doc/src/ssl_app.xml
+@@ -47,10 +47,10 @@
+ 
+ Note that the environment parameters can be set on the command line,
+ for instance,
+- <c>erl ... -ssl protocol_version '[sslv3, tlsv1]' ...</c>.
++ <c>erl ... -ssl protocol_version '[tlsv1.1, tlsv1]' ...</c>.
+ 
+ <taglist>
+- <tag><c><![CDATA[protocol_version = [sslv3|tlsv1] <optional>]]></c>.</tag>
++ <tag><c><![CDATA[protocol_version = [tlsv1|tlsv1.1|tlsv1.2] <optional>]]></c>.</tag>
+ <item>
+ 	Protocol that will be supported by started clients and
+ 	servers. If this option is not set it will default to all
+@@ -58,6 +58,9 @@
+ 	Note that this option may be overridden by the version option
+ 	to ssl:connect/[2,3] and ssl:listen/2.
+ 	
++	For Debian GNU/Linux distribution the sslv3 protocol was
++	disabled due to its security issues.
++	
+ </item>
+ 
+ <tag><c><![CDATA[session_lifetime = integer() <optional>]]></c></tag>
+diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl
+index 75efb64..155fa81 100644
+--- a/lib/ssl/src/ssl_internal.hrl
++++ b/lib/ssl/src/ssl_internal.hrl
+@@ -67,8 +67,8 @@
+ -define(TRUE, 0).
+ -define(FALSE, 1).
+ 
+--define(ALL_SUPPORTED_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1, sslv3]).
+--define(MIN_SUPPORTED_VERSIONS, ['tlsv1.1', tlsv1, sslv3]).
++-define(ALL_SUPPORTED_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1]).
++-define(MIN_SUPPORTED_VERSIONS, ['tlsv1.1', tlsv1]).
+ -define(ALL_DATAGRAM_SUPPORTED_VERSIONS, ['dtlsv1.2', dtlsv1]).
+ -define(MIN_DATAGRAM_SUPPORTED_VERSIONS, ['dtlsv1.2', dtlsv1]).
+ 
+diff --git a/lib/ssl/src/ssl_record.hrl b/lib/ssl/src/ssl_record.hrl
+index 6aab35d..1511abd 100644
+--- a/lib/ssl/src/ssl_record.hrl
++++ b/lib/ssl/src/ssl_record.hrl
+@@ -144,6 +144,7 @@
+ %% 	 }).
+ 
+ -define(LOWEST_MAJOR_SUPPORTED_VERSION, 3).
++-define(LOWEST_MINOR_SUPPORTED_VERSION, 1).
+ 	
+ 
+ -record(generic_stream_cipher, {
+diff --git a/lib/ssl/src/tls_record.erl b/lib/ssl/src/tls_record.erl
+index f50ea22..aa4fc8d 100644
+--- a/lib/ssl/src/tls_record.erl
++++ b/lib/ssl/src/tls_record.erl
+@@ -276,14 +276,20 @@ supported_protocol_versions([_|_] = Vsns) ->
+ %%--------------------------------------------------------------------
+ -spec is_acceptable_version(tls_version()) -> boolean().
+ is_acceptable_version({N,_}) 
+- when N >= ?LOWEST_MAJOR_SUPPORTED_VERSION ->
++ when N > ?LOWEST_MAJOR_SUPPORTED_VERSION ->
++ true;
++is_acceptable_version({N,M}) 
++ when N == ?LOWEST_MAJOR_SUPPORTED_VERSION andalso M >= ?LOWEST_MINOR_SUPPORTED_VERSION ->
+ true;
+ is_acceptable_version(_) ->
+ false.
+ 
+ -spec is_acceptable_version(tls_version(), Supported :: [tls_version()]) -> boolean().
+ is_acceptable_version({N,_} = Version, Versions) 
+- when N >= ?LOWEST_MAJOR_SUPPORTED_VERSION ->
++ when N > ?LOWEST_MAJOR_SUPPORTED_VERSION ->
++ lists:member(Version, Versions);
++is_acceptable_version({N,M} = Version, Versions) 
++ when N == ?LOWEST_MAJOR_SUPPORTED_VERSION andalso M >= ?LOWEST_MINOR_SUPPORTED_VERSION ->
+ lists:member(Version, Versions);
+ is_acceptable_version(_,_) ->
+ false.

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

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

otp-make-subpackages.py Deleted

@@ -1,180 +0,0 @@
-import glob
-import os
-import re
-import rpm
-import sys
-
-ts = rpm.TransactionSet()
-
-packages = []
-for arg in sys.argv[1:]:
-	packages += glob.glob(arg)
-
-erlang_provides = {}
-erlang_requires = {}
-
-package_names = []
-package_headers = {}
-
-##
-## Custom tweaks begins here
-##
-
-# These packages should be marked as noarch
-package_noarch = [
-		"emacs-erlang",
-		"emacs-erlang-el",
-		"erlang-doc",
-		"xemacs-erlang",
-		"xemacs-erlang-el"]
-
-# These are additional Requires which cannot be picked up automatically (yet).
-# TODO these should be added automatically
-package_additional_requires = {
-		"emacs-erlang": ["emacs-common-erlang = %{version}-%{release}", "emacs(bin) >= %{_emacs_version}" ],
-		"emacs-erlang-el": ["emacs-erlang = %{version}-%{release}"],
-		"erlang-dialyzer": ["graphviz"],
-		"erlang-erl_interface": ["%{name}-erts%{?_isa} = %{version}-%{release}"],
-		# This library (lksctp-tools) is dlopened so it can't be picked
-		# up automatically by the RPM dependency checker
-		"erlang-erts": ["lksctp-tools"],
-		"erlang-gs": ["tk"],
-		# Stores files/links in /usr/share/java so has to depend on jpackage-utils
-		"erlang-ic": ["jpackage-utils"],
-		# Stores files/links in /usr/share/java so has to depend on jpackage-utils
-		"erlang-jinterface": ["%{name}-erts%{?_isa} = %{version}-%{release}", "jpackage-utils"],
-		"erlang-wx": ["mesa-libGL", "mesa-libGLU"],
-		"xemacs-erlang": ["emacs-common-erlang = %{version}-%{release}", "xemacs(bin) >= %{_xemacs_version}"],
-		"xemacs-erlang-el": ["xemacs-erlang = %{version}-%{release}"]
-		}
-
-package_additional_buildrequires = {
-		"emacs-erlang": ["emacs", "emacs-el"],
-		"erlang-crypto": ["openssl-devel"],
-		"erlang-diameter": ["ed"],
-
-		# BEWARE. No fop for EPEL5, and only for x86/x86_64 in EPEL6,
-		# so we cannot regenerate docs here. (Un)Fortunately we dropped
-		# support for EPEL6 and older versions.
-		# FIXME add bootstrap condition first.
-		"erlang-doc": ["fop", "libxslt"],
-
-		"erlang-erts": ["lksctp-tools-devel", "m4", "ncurses-devel", "zlib-devel"],
-		"erlang-gs": ["tcl-devel", "tk-devel"],
-
-		# in EPEL6 on arches different from %{ix86} x86_64 we have to
-		# use java-devel-gcj, so technically this requirement makes it
-		# impossible to build Java support there. (Un)Fortunately we
-		# already dropped full support for EPEL6 and older versions.
-		"erlang-ic": ["java-devel"],
-		"erlang-jinterface": ["java-devel"],
-
-		"erlang-odbc": ["unixODBC-devel"],
-		"erlang-wx": ["wxGTK-devel"],
-		"xemacs-erlang": ["xemacs", "xemacs-packages-extra-el"],
-		}
-
-package_additional_obsoletes = {
-		"erlang-erts": [
-			"erlang-appmon",
-			"erlang-docbuilder",
-			"erlang-inviso",
-			"erlang-pman",
-			"erlang-toolbar",
-			"erlang-tv"],
-		}
-
-##
-## Custom tweaks ends here
-##
-
-# To match 'erlang(asn1ct_eval_ext:transform_to_EXTERNAL1994/1)'
-prog = re.compile("^erlang(.*:.*/\d+)")
-rpmmask = re.compile(".*\.rpm")
-
-# iterate over all rpms
-for package in sorted([p for p in packages if rpmmask.match(p)]):
-
-	# A tricky part. We are processing packages, rebuilt with
-	# %{__erlang_provides_requires}. Otherwise we won't get information
-	# about imports/exports (until we learn how to parse Erlang BEAM file
-	# headers with Python.
-	fd = os.open(package, os.O_RDONLY)
-	h = ts.hdrFromFdno(fd)
-	os.close(fd)
-
-	rpm_name = h[rpm.RPMTAG_NAME]
-
-	# Let's calculate provides
-	# We'll create dictionary to speedup future use
-	# FIXME duplicate provides
-	local_provides = [p for p in h[rpm.RPMTAG_PROVIDENAME] if prog.match(p)]
-	erlang_provides.update({k: rpm_name for k in local_provides})
-
-	# Let's calculate requires
-	erlang_requires.update({rpm_name: [r for r in h[rpm.RPMTAG_REQUIRENAME] if prog.match(r) and not r in local_provides]})
-
-	package_headers.update({rpm_name: h})
-
-	package_names.append(rpm_name)
-
-namemask = re.compile("^erlang-[a-zA-Z0-9_]*$")
-
-print "### BEGIN OF AUTOGENERATED LIST ###"
-print ""
-
-for name in package_names:
-	h = package_headers[name]
-
-	if name == "erlang-doc":
-		# Additional ifdef just for this sub-package (see below)
-		print "%if %{with doc}"
-
-	if namemask.match(name):
-		print "%%package %s" % name.replace("erlang-", "")
-	else:
-		print "%%package -n %s" % name
-
-	print "Summary: %s" % h[rpm.RPMTAG_SUMMARY]
-	print "Group: %s" % h[rpm.RPMTAG_GROUP]
-
-	rawdeps = [erlang_provides.get(r, "Error: missing requires: %s" % r) for r in erlang_requires[name]]
-
-	deps = set()
-	dependency_add = deps.add
-	[x for x in rawdeps if not (x in deps or dependency_add(x))]
-
-	# Additional BuildRequires (if any):
-	for br in package_additional_buildrequires.get(name, []):
-		print "BuildRequires: %s" % br
-
-	# Add basic autogenerated Requires:
-	for r in sorted(deps):
-		#Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
-		print "Requires: %s%%{?_isa} = %%{version}-%%{release}" % r.replace("erlang-", "%{name}-")
-
-	# Add custom additional Requires (if any):
-	for r in package_additional_requires.get(name, []):
-		print "Requires: %s" % r
-
-	# Add custom additional Obsoletes (if any):
-	for os in package_additional_obsoletes.get(name, []):
-		print "Obsoletes: %s" % os
-
-	if name in package_noarch:
-		print "BuildArch: noarch"
-
-	print ""
-	if namemask.match(name):
-		print "%%description %s" % name.replace("erlang-", "")
-	else:
-		print "%%description -n %s" % name
-	print "%s" % h[rpm.RPMTAG_DESCRIPTION]
-
-	if name == "erlang-doc":
-		# Additional ifdef just for this sub-package (see above)
-		print "%endif"
-
-	print ""
-
-print "### END OF AUTOGENERATED LIST ###"

Build Results
RPM Lint

Refresh

Comments for request 1705 0

Request History

vanmeeuwen created request over 8 years ago

Submit erlang

vanmeeuwen accepted review over 8 years ago

vanmeeuwen approved review over 8 years ago

vanmeeuwen accepted request over 8 years ago