Modularization of erlang package

2 files changed, 929 insertions, 31 deletions

diff --git a/erlang.spec b/erlang.spec
index eb436fa..c622ce4 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -1,9 +1,11 @@
+%{?__erlang_provides_requires: %{__erlang_provides_requires}}
+
 %define ver R13B
 %define rel 04
 
 Name:           erlang
 Version:        %{ver}
-Release:        %{rel}.4%{?dist}
+Release:        %{rel}.5%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
@@ -34,19 +36,66 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel
 BuildRequires:  openssl-devel
 BuildRequires:	zlib-devel
-BuildRequires:  unixODBC-devel
-BuildRequires:  wxGTK-devel
-BuildRequires:	tcl-devel
-BuildRequires:	tk-devel
-BuildRequires:	java-1.6.0-openjdk-devel
 BuildRequires:  flex
 BuildRequires:	m4
 BuildRequires:	fop
 
-Requires:       tk
-Requires:	mesa-libGL
-Requires:	mesa-libGLU
-
+Requires: erlang-appmon = %{version}-%{release}
+Requires: erlang-asn1 = %{version}-%{release}
+Requires: erlang-common_test = %{version}-%{release}
+Requires: erlang-compiler = %{version}-%{release}
+Requires: erlang-cosEvent = %{version}-%{release}
+Requires: erlang-cosEventDomain = %{version}-%{release}
+Requires: erlang-cosFileTransfer = %{version}-%{release}
+Requires: erlang-cosNotification = %{version}-%{release}
+Requires: erlang-cosProperty = %{version}-%{release}
+Requires: erlang-cosTime = %{version}-%{release}
+Requires: erlang-cosTransaction = %{version}-%{release}
+Requires: erlang-crypto = %{version}-%{release}
+Requires: erlang-debugger = %{version}-%{release}
+Requires: erlang-dialyzer = %{version}-%{release}
+Requires: erlang-docbuilder = %{version}-%{release}
+Requires: erlang-edoc = %{version}-%{release}
+Requires: erlang-erl_docgen = %{version}-%{release}
+Requires: erlang-erl_interface = %{version}-%{release}
+Requires: erlang-erts = %{version}-%{release}
+Requires: erlang-et = %{version}-%{release}
+Requires: erlang-eunit = %{version}-%{release}
+Requires: erlang-examples = %{version}-%{release}
+Requires: erlang-gs = %{version}-%{release}
+Requires: erlang-hipe = %{version}-%{release}
+Requires: erlang-ic = %{version}-%{release}
+Requires: erlang-inets = %{version}-%{release}
+Requires: erlang-inviso = %{version}-%{release}
+Requires: erlang-jinterface = %{version}-%{release}
+Requires: erlang-kernel = %{version}-%{release}
+Requires: erlang-megaco = %{version}-%{release}
+Requires: erlang-mnesia = %{version}-%{release}
+Requires: erlang-observer = %{version}-%{release}
+Requires: erlang-odbc = %{version}-%{release}
+Requires: erlang-orber = %{version}-%{release}
+Requires: erlang-os_mon = %{version}-%{release}
+Requires: erlang-otp_mibs = %{version}-%{release}
+Requires: erlang-parsetools = %{version}-%{release}
+Requires: erlang-percept = %{version}-%{release}
+Requires: erlang-pman = %{version}-%{release}
+Requires: erlang-public_key = %{version}-%{release}
+Requires: erlang-reltool = %{version}-%{release}
+Requires: erlang-runtime_tools = %{version}-%{release}
+Requires: erlang-sasl = %{version}-%{release}
+Requires: erlang-snmp = %{version}-%{release}
+Requires: erlang-ssh = %{version}-%{release}
+Requires: erlang-ssl = %{version}-%{release}
+Requires: erlang-stdlib = %{version}-%{release}
+Requires: erlang-syntax_tools = %{version}-%{release}
+Requires: erlang-test_server = %{version}-%{release}
+Requires: erlang-toolbar = %{version}-%{release}
+Requires: erlang-tools = %{version}-%{release}
+Requires: erlang-tv = %{version}-%{release}
+Requires: erlang-typer = %{version}-%{release}
+Requires: erlang-webtool = %{version}-%{release}
+Requires: erlang-wx = %{version}-%{release}
+Requires: erlang-xmerl = %{version}-%{release}
 
 %description
 Erlang is a general-purpose programming language and runtime
@@ -54,6 +103,131 @@ environment. Erlang has built-in support for concurrency, distribution
 and fault tolerance. Erlang is used in several large telecommunication
 systems from Ericsson.
 
+%package appmon
+Summary:	A utility used to supervise Applications executing on several Erlang nodes
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description appmon
+A utility used to supervise Applications executing on several Erlang nodes.
+
+%package asn1
+Summary:	Provides support for Abstract Syntax Notation One
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description asn1
+Provides support for Abstract Syntax Notation One.
+
+%package common_test
+Summary:	A portable framework for automatic testing
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%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
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description compiler
+A byte code compiler for Erlang which produces highly compact code.
+
+%package cosEvent
+Summary:	Orber OMG Event Service
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description cosEvent
+Orber OMG Event Service.
+
+%package cosEventDomain
+Summary:	Orber OMG Event Domain Service
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description cosEventDomain
+Orber OMG Event Domain Service.
+
+%package cosFileTransfer
+Summary:	Orber OMG File Transfer Service
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description cosFileTransfer
+Orber OMG File Transfer Service.
+
+%package cosNotification
+Summary:	Orber OMG Notification Service
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description cosNotification
+Orber OMG Notification Service.
+
+%package cosProperty
+Summary:	Orber OMG Property Service
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description cosProperty
+Orber OMG Property Service.
+
+%package cosTime
+Summary:	Orber OMG Timer and TimerEvent Service
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description cosTime
+Orber OMG Timer and TimerEvent Service.
+
+%package cosTransaction
+Summary:	Orber OMG Transaction Service
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description cosTransaction
+Orber OMG Transaction Service.
+
+%package crypto
+Summary:	Cryptographical support
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description crypto
+Cryptographical support.
+
+%package debugger
+Summary:	A debugger for debugging and testing of Erlang programs
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description debugger
+A debugger for debugging and testing of Erlang programs.
+
+%package dialyzer
+Summary:	A DIscrepany AnaLYZer for ERlang programs
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description dialyzer
+A DIscrepany AnaLYZer for ERlang programs.
 
 %package doc
 Summary:	Erlang documentation
@@ -64,6 +238,401 @@ Obsoletes:	%{name}-doc < R13B-04.4
 %description doc
 Documentation for Erlang.
 
+%package docbuilder
+Summary:	Tool for generating HTML documentation for applications
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description docbuilder
+Tool for generating HTML documentation for applications.
+
+%package edoc
+Summary:	A utility used to generate documentation out of tags in source files
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description edoc
+A utility used to generate documentation out of tags in source files.
+
+%package erl_docgen
+Summary:	A utility used to generate erlang HTML documentation
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description erl_docgen
+A utility used to generate erlang HTML documentation.
+
+%package erl_interface
+Summary:	Low level interface to C
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description erl_interface
+Low level interface to C.
+
+%package erts
+Summary:	Functionality necessary to run the Erlang System itself
+Group:		Development/Languages
+Obsoletes:	%{name} < R13B-04.5
+
+%description erts
+Functionality necessary to run the Erlang System itself.
+
+%package et
+Summary:	An event tracer for Erlang programs
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description et
+An event tracer for Erlang programs.
+
+%package eunit
+Summary:	Support for unit testing
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description eunit
+Support for unit testing.
+
+%package examples
+Summary:	Examples for some Erlang modules
+Group:		Development/Languages
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description examples
+Examples for some Erlang modules.
+
+%package gs
+Summary:	A library for Tcl/Tk support in Erlang
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+BuildRequires:	tcl-devel
+BuildRequires:	tk-devel
+Requires:       tk
+Obsoletes:	%{name} < R13B-04.5
+
+%description gs
+A Graphics System used to write platform independent user interfaces.
+
+%package hipe
+Summary:	High Performance Erlang
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description hipe
+High Performance Erlang.
+
+%package ic
+Summary:	IDL compiler
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description ic
+IDL compiler.
+
+%package inets
+Summary:	A set of services such as a Web server and a ftp client etc
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description inets
+A set of services such as a Web server and a ftp client etc.
+
+%package inviso
+Summary:	A trace tool for both development and delivered systems
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description inviso
+A trace tool for both development and delivered systems.
+
+%package jinterface
+Summary:	A library for accessing Java from Erlang
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+BuildRequires:	java-1.6.0-openjdk-devel
+
+%description jinterface
+Low level interface to Java.
+
+%package kernel
+Summary:	Main erlang library
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description kernel
+Main erlang library.
+
+%package megaco
+Summary:	Megaco/H.248 support library
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description megaco
+Megaco/H.248 is a protocol for control of elements in a physically
+decomposed multimedia gateway, enabling separation of call control
+from media conversion.
+
+%package mnesia
+Summary:	A heavy duty real-time distributed database
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description mnesia
+A heavy duty real-time distributed database.
+
+%package observer
+Summary:	A set of tools for tracing and investigation of distributed systems
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description observer
+A set of tools for tracing and investigation of distributed systems.
+
+%package odbc
+Summary:	A library for unixODBC support in Erlang
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+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
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description orber
+A CORBA Object Request Broker.
+
+%package os_mon
+Summary:	A monitor which allows inspection of the underlying operating system
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description os_mon
+A monitor which allows inspection of the underlying operating system.
+
+%package otp_mibs
+Summary:	SNMP management information base for Erlang/OTP nodes
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description otp_mibs
+SNMP management information base for Erlang/OTP nodes.
+
+%package parsetools
+Summary:	A set of parsing and lexical analysis tools
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description parsetools
+A set of parsing and lexical analysis tools.
+
+%package percept
+Summary:	A concurrency profiler tool
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description percept
+A concurrency profiler tool.
+
+%package pman
+Summary:	A graphical process manager used to inspect Erlang processes
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description pman
+A graphical process manager used to inspect Erlang processes.
+
+%package public_key
+Summary:	API to public key infrastructure
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description public_key
+API to public key infrastructure.
+
+%package reltool
+Summary:	A release management tool
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description reltool
+Reltool is a release management tool. It analyses a given
+Erlang/OTP installation and determines various dependencies
+between applications. The graphical frontend depicts the
+dependencies and enables interactive customization of a
+target system. The backend provides a batch interface
+for generation of customized target systems.
+
+%package runtime_tools
+Summary:	A set of tools to include in a production system
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description runtime_tools
+A set of tools to include in a production system.
+
+%package sasl
+Summary:	The System Architecture Support Libraries
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description sasl
+The System Architecture Support Libraries is a set of tools for
+release upgrades and alarm handling etc.
+
+%package snmp
+Summary:	Simple Network Management Protocol (SNMP) support
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description snmp
+Simple Network Management Protocol (SNMP) support including a
+MIB compiler and tools for creating SNMP agents.
+
+%package ssh
+Summary:	Secure Shell application with sftp and ssh support
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description ssh
+Secure Shell application with sftp and ssh support.
+
+%package ssl
+Summary:	Secure Socket Layer support
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description ssl
+Secure Socket Layer support.
+
+%package stdlib
+Summary:	The Erlang standard libraries
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description stdlib
+The Erlang standard libraries.
+
+%package syntax_tools
+Summary:	A set of tools for dealing with erlang sources
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description syntax_tools
+A utility used to handle abstract Erlang syntax trees,
+reading source files differently, pretty-printing syntax trees.
+
+%package test_server
+Summary:	The OTP Test Server
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description test_server
+The OTP Test Server.
+
+%package toolbar
+Summary:	A tool bar simplifying access to the Erlang tools
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description toolbar
+A tool bar simplifying access to the Erlang tools.
+
+%package tools
+Summary:	A set of programming tools including a coverage analyzer etc
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description tools
+A set of programming tools including a coverage analyzer etc.
+
+%package tv
+Summary:	An ETS and MNESIA graphical table visualizer
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description tv
+An ETS and MNESIA graphical table visualizer.
+
+%package typer
+Summary:	TYPe annotator for ERlang programs
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description typer
+TYPe annotator for ERlang programs.
+
+%package webtool
+Summary:	A tool that simplifying the use of web based Erlang tools
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description webtool
+A tool that simplifying the use of web based Erlang tools.
+
+%package wx
+Summary:	A library for wxWidgets support in Erlang
+Group:		Development/Languages
+Requires:	%{name}-erts = %{version}-%{release}
+Requires:	mesa-libGL
+Requires:	mesa-libGLU
+Obsoletes:	%{name} < R13B-04.5
+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
+Requires:	%{name}-erts = %{version}-%{release}
+Obsoletes:	%{name} < R13B-04.5
+
+%description xmerl
+Provides support for XML 1.0.
 
 %prep
 %setup -q -n otp_src_%{ver}%{rel}
@@ -89,12 +658,15 @@ make
 rm -rf $RPM_BUILD_ROOT
 make INSTALL_PREFIX=$RPM_BUILD_ROOT install
 
-# clean up
-find $RPM_BUILD_ROOT%{_libdir}/erlang -perm 0775 | xargs chmod 755
-find $RPM_BUILD_ROOT%{_libdir}/erlang -name Makefile | xargs chmod 644
-find $RPM_BUILD_ROOT%{_libdir}/erlang -name \*.o | xargs chmod 644
-find $RPM_BUILD_ROOT%{_libdir}/erlang -name \*.bat | xargs rm -f
-find $RPM_BUILD_ROOT%{_libdir}/erlang -name index.txt.old | xargs rm -f
+# fix 0775 permission on some directories
+find $RPM_BUILD_ROOT%{_libdir}/erlang -type d -perm 0775 | xargs chmod 755
+
+# Fix 664 file mode
+chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist/c_src/Makefile
+chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist/src/Makefile
+chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/Makefile
+chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/src/Makefile
+chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/priv/obj/Makefile
 
 # install additional doc files
 mkdir -p erlang_doc
@@ -112,17 +684,20 @@ do
   ln -sf ../%{_lib}/erlang/bin/$file .
 done
 
-# remove buildroot from installed files
-cd $RPM_BUILD_ROOT%{_libdir}/erlang
-sed -i "s|$RPM_BUILD_ROOT||" erts*/bin/{erl,start} releases/RELEASES bin/{erl,start}
+# Remove batch files intended to use on one proprietary OS.
+rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/observer-*/priv/bin/etop.bat
+rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/observer-*/priv/bin/getop.bat
+rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/webtool-*/priv/bin/start_webtool.bat
+
+# Remove old txt files
+rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/etc/otpCA/index.txt.old
+rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/etc/erlangCA/index.txt.old
 
-# remove unneeded sources, but keep *.hrl and *.yrl
-for d in $RPM_BUILD_ROOT%{_libdir}/erlang/lib/* ; do find $d/src -maxdepth 1 -type f ! -name "*.hrl" -print -delete || true ; done
+# remove unneeded Erlang sources, but keep *.hrl files
+for d in $RPM_BUILD_ROOT%{_libdir}/erlang/lib/* ; do find $d/src -type f ! -name "*.hrl" -print -delete || true ; done
 rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/hipe-*/{cerl,flow,icode,main,misc,util}/*.erl
 rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/orber-*/COSS/CosNaming/*.erl
-rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/snmp-*/src/{agent,app,compiler,manager,misc}/*.erl
-rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/wx-*/src/gen/*.erl
-find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ -maxdepth 2 -type d -name src -empty -delete
+find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/*/src -type d -empty -delete
 
 # remove C and Java sources
 rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/c_src
@@ -133,17 +708,23 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/jinterface-*/java_src
 rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/odbc-*/c_src
 rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/tools-*/c_src
 
-# remove empty or intermediate files and directories
+# remove empty directories
 rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/doc
 rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/man
+
+# remove unneeded files
 rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/cosEvent-*/info
 rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/cosEventDomain-*/info
-rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/crypto-*/priv/obj
 rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/hipe-*/vsn.mk
-rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/lib/odbc-*/priv/obj
-rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/priv/obj
+
+# No longer needed utilities for formatting man-pages
 rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/misc
 
+# Remove *.o files
+rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/crypto-*/priv/obj
+rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/odbc-*/priv/obj
+rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/priv/obj
+
 # Install RPM related files
 install -D -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-provides.escript
 install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-provides.sh
@@ -158,9 +739,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+
 %doc AUTHORS EPLICENCE README.md
-%{_bindir}/*
-%{_libdir}/erlang
+%doc %{_libdir}/erlang/PR.template
+%doc %{_libdir}/erlang/README
+%doc %{_libdir}/erlang/COPYRIGHT
 
 # RPM stuff
 %{_sysconfdir}/rpm/macros.erlang
@@ -169,17 +752,331 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/rpm/erlang-find-requires.escript
 %{_libdir}/rpm/erlang-find-requires.sh
 
+%files appmon
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/appmon-*/
+
+%files asn1
+%defattr(-,root,root)
+%dir %{_libdir}/erlang/lib/asn1-*/
+%{_libdir}/erlang/lib/asn1-*/ebin
+%{_libdir}/erlang/lib/asn1-*/priv
+%{_libdir}/erlang/lib/asn1-*/src
+
+%files common_test
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/common_test-*/
+
+%files compiler
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/compiler-*/
+
+%files cosEvent
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/cosEvent-*/
+
+%files cosEventDomain
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/cosEventDomain-*/
+
+%files cosFileTransfer
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/cosFileTransfer-*/
+
+%files cosNotification
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/cosNotification-*/
+
+%files cosProperty
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/cosProperty-*/
+
+%files cosTime
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/cosTime-*/
+
+%files cosTransaction
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/cosTransactions-*/
+
+%files crypto
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/crypto-*/
+
+%files debugger
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/debugger-*/
+
+%files dialyzer
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/dialyzer-*/
 
 %files doc
 %defattr(-,root,root)
 %doc erlang_doc/*
 
+%files docbuilder
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/docbuilder-*/
+
+%files edoc
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/edoc-*/
+
+%files erl_docgen
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/erl_docgen-*/
+
+%files erl_interface
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/erl_interface-*/
+
+%files erts
+%defattr(-,root,root)
+%dir %{_libdir}/erlang
+%dir %{_libdir}/erlang/lib/
+%{_bindir}/*
+%{_libdir}/erlang/bin/
+%{_libdir}/erlang/erts-*/
+%{_libdir}/erlang/lib/erts-*/
+%{_libdir}/erlang/man/
+%{_libdir}/erlang/releases/
+%{_libdir}/erlang/usr/
+%{_libdir}/erlang/Install
+
+%files et
+%defattr(-,root,root)
+%dir %{_libdir}/erlang/lib/et-*/
+%{_libdir}/erlang/lib/et-*/ebin
+%{_libdir}/erlang/lib/et-*/include
+%{_libdir}/erlang/lib/et-*/src
+
+%files eunit
+%defattr(-,root,root)
+%dir %{_libdir}/erlang/lib/eunit-*/
+%{_libdir}/erlang/lib/eunit-*/ebin
+%{_libdir}/erlang/lib/eunit-*/include
+
+%files examples
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/asn1-*/examples
+%{_libdir}/erlang/lib/et-*/examples
+%{_libdir}/erlang/lib/eunit-*/examples
+%{_libdir}/erlang/lib/gs-*/examples
+%{_libdir}/erlang/lib/ic-*/examples
+%{_libdir}/erlang/lib/inets-*/examples
+%{_libdir}/erlang/lib/kernel-*/examples
+%{_libdir}/erlang/lib/megaco-*/examples
+%{_libdir}/erlang/lib/mnesia-*/examples
+%{_libdir}/erlang/lib/orber-*/examples
+%{_libdir}/erlang/lib/reltool-*/examples
+%{_libdir}/erlang/lib/snmp-*/examples
+%{_libdir}/erlang/lib/ssl-*/examples
+%{_libdir}/erlang/lib/stdlib-*/examples
+%{_libdir}/erlang/lib/syntax_tools-*/examples
+%{_libdir}/erlang/lib/tools-*/examples
+%{_libdir}/erlang/lib/wx-*/examples
+
+%files gs
+%defattr(-,root,root)
+%dir %{_libdir}/erlang/lib/gs-*/
+%{_libdir}/erlang/lib/gs-*/contribs
+%{_libdir}/erlang/lib/gs-*/ebin
+%{_libdir}/erlang/lib/gs-*/priv
+%{_libdir}/erlang/lib/gs-*/src
+
+%files hipe
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/hipe-*/
+
+%files ic
+%defattr(-,root,root)
+%dir %{_libdir}/erlang/lib/ic-*/
+%{_libdir}/erlang/lib/ic-*/ebin
+%{_libdir}/erlang/lib/ic-*/include
+%{_libdir}/erlang/lib/ic-*/priv
+%{_libdir}/erlang/lib/ic-*/src
+
+%files inets
+%defattr(-,root,root)
+%dir %{_libdir}/erlang/lib/inets-*/
+%{_libdir}/erlang/lib/inets-*/ebin
+%{_libdir}/erlang/lib/inets-*/priv
+%{_libdir}/erlang/lib/inets-*/src
+
+%files inviso
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/inviso-*/
+
+%files jinterface
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/jinterface-*/
+
+%files kernel
+%defattr(-,root,root)
+%dir %{_libdir}/erlang/lib/kernel-*/
+%{_libdir}/erlang/lib/kernel-*/ebin
+%{_libdir}/erlang/lib/kernel-*/include
+%{_libdir}/erlang/lib/kernel-*/src
+
+%files megaco
+%defattr(-,root,root)
+%dir %{_libdir}/erlang/lib/megaco-*/
+%{_libdir}/erlang/lib/megaco-*/ebin
+%{_libdir}/erlang/lib/megaco-*/include
+%{_libdir}/erlang/lib/megaco-*/priv
+%{_libdir}/erlang/lib/megaco-*/src
+
+%files mnesia
+%defattr(-,root,root)
+%dir %{_libdir}/erlang/lib/mnesia-*/
+%{_libdir}/erlang/lib/mnesia-*/ebin
+%{_libdir}/erlang/lib/mnesia-*/include
+%{_libdir}/erlang/lib/mnesia-*/src
+
+%files observer
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/observer-*/
+
+%files odbc
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/odbc-*/
+
+%files orber
+%defattr(-,root,root)
+%dir %{_libdir}/erlang/lib/orber-*/
+%{_libdir}/erlang/lib/orber-*/COSS
+%{_libdir}/erlang/lib/orber-*/ebin
+%{_libdir}/erlang/lib/orber-*/include
+%{_libdir}/erlang/lib/orber-*/java_src
+%{_libdir}/erlang/lib/orber-*/priv
+%{_libdir}/erlang/lib/orber-*/src
+
+%files os_mon
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/os_mon-*/
+
+%files otp_mibs
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/otp_mibs-*/
+
+%files parsetools
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/parsetools-*/
+
+%files percept
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/percept-*/
+
+%files pman
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/pman-*/
+
+%files public_key
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/public_key-*/
+
+%files reltool
+%defattr(-,root,root)
+%dir %{_libdir}/erlang/lib/reltool-*/
+%{_libdir}/erlang/lib/reltool-*/ebin
+%{_libdir}/erlang/lib/reltool-*/src
+
+%files runtime_tools
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/runtime_tools-*/
+
+%files sasl
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/sasl-*/
+
+%files snmp
+%defattr(-,root,root)
+%dir %{_libdir}/erlang/lib/snmp-*/
+%{_libdir}/erlang/lib/snmp-*/ebin
+%{_libdir}/erlang/lib/snmp-*/include
+%{_libdir}/erlang/lib/snmp-*/mibs
+%{_libdir}/erlang/lib/snmp-*/priv
+%{_libdir}/erlang/lib/snmp-*/src
+
+%files ssh
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/ssh-*/
+
+%files ssl
+%defattr(-,root,root)
+%dir %{_libdir}/erlang/lib/ssl-*/
+%{_libdir}/erlang/lib/ssl-*/ebin
+%{_libdir}/erlang/lib/ssl-*/include
+%{_libdir}/erlang/lib/ssl-*/pkix
+%{_libdir}/erlang/lib/ssl-*/priv
+%{_libdir}/erlang/lib/ssl-*/src
+
+%files stdlib
+%defattr(-,root,root)
+%dir %{_libdir}/erlang/lib/stdlib-*/
+%{_libdir}/erlang/lib/stdlib-*/ebin
+%{_libdir}/erlang/lib/stdlib-*/include
+%{_libdir}/erlang/lib/stdlib-*/src
+
+%files syntax_tools
+%defattr(-,root,root)
+%dir %{_libdir}/erlang/lib/syntax_tools-*/
+%{_libdir}/erlang/lib/syntax_tools-*/ebin
+
+%files test_server
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/test_server-*/
+
+%files toolbar
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/toolbar-*/
+
+%files tools
+%defattr(-,root,root)
+%dir %{_libdir}/erlang/lib/tools-*/
+%{_libdir}/erlang/lib/tools-*/bin
+%{_libdir}/erlang/lib/tools-*/ebin
+%{_libdir}/erlang/lib/tools-*/emacs
+%{_libdir}/erlang/lib/tools-*/priv
+%{_libdir}/erlang/lib/tools-*/src
+
+%files tv
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/tv-*/
+
+%files typer
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/typer-*/
+
+%files webtool
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/webtool-*/
+
+%files wx
+%defattr(-,root,root)
+%dir %{_libdir}/erlang/lib/wx-*/
+%{_libdir}/erlang/lib/wx-*/ebin
+%{_libdir}/erlang/lib/wx-*/include
+%{_libdir}/erlang/lib/wx-*/priv
+%{_libdir}/erlang/lib/wx-*/src
+
+%files xmerl
+%defattr(-,root,root)
+%{_libdir}/erlang/lib/xmerl-*/
+
 
 %post
-%{_libdir}/erlang/Install -minimal %{_libdir}/erlang >/dev/null 2>/dev/null
+%{_libdir}/erlang/Install -minimal -cross %{_libdir}/erlang >/dev/null 2>/dev/null
 
 
 %changelog
+* Wed Apr 17 2010 Peter Lemenkov <lemenkov@gmail.com> - R13B-04.5
+- Use erlang rpm macros for adding provides/reqires
+- All %%{_libdir}/erlang/lib/* items were splitted off from main package, which
+  in turn becomes purely virtual now.
+- Removing RPM_BUILD_ROOT from several installed files is no longer required
+
 * Sat Apr 17 2010 Peter Lemenkov <lemenkov@gmail.com> - R13B-04.4
 - Added missing Requires mesa-libGL{U} for wx module (rhbz #583287)
 - Fix for buffer overflow in pcre module (rhbz #583288)
diff --git a/import.log b/import.log
index 0cbb31b..cfcf559 100644
--- a/import.log
+++ b/import.log
@@ -2,3 +2,4 @@ erlang-R13B-04_1_fc12:HEAD:erlang-R13B-04.1.fc12.src.rpm:1268645923
 erlang-R13B-04_2_fc12:HEAD:erlang-R13B-04.2.fc12.src.rpm:1269608855
 erlang-R13B-04_3_fc12:HEAD:erlang-R13B-04.3.fc12.src.rpm:1271238928
 erlang-R13B-04_4_fc12:HEAD:erlang-R13B-04.4.fc12.src.rpm:1271523697
+erlang-R13B-04_5_fc12:HEAD:erlang-R13B-04.5.fc12.src.rpm:1272270707