From 944625c96a210143e34f988e6cd0636f7097f80f Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Tue, 6 Sep 2005 18:30:13 +0000 Subject: added dist tag --- erlang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index cfe7a6f..53e765b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,6 +1,6 @@ Name: erlang Version: R10B -Release: 6.3 +Release: 6.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages -- cgit From 4d879566b37c59e975119d1ce9a53c5a0ddede27 Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sat, 1 Oct 2005 09:15:33 +0000 Subject: added tk-devel req --- erlang.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 53e765b..15abe7b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,6 +1,6 @@ Name: erlang Version: R10B -Release: 6.3%{?dist} +Release: 6.4%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -14,6 +14,8 @@ Patch1: otp-install.patch Patch2: otp-rpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, openssl-devel, flex, unixODBC-devel +BuildRequires: tcl-devel, tk-devel +Requires: tk %description Erlang is a general-purpose programming language and runtime @@ -88,6 +90,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Oct 1 2005 Gerard Milmeister - R10B-6.4 +- Added tk-devel and tcl-devel to buildreq +- Added tk to req + * Tue Sep 6 2005 Gerard Milmeister - R10B-6.3 - Remove perl BuildRequires -- cgit From a93f1271246ba861c470e01bb510d4b8aab4131c Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sat, 29 Oct 2005 22:34:15 +0000 Subject: new version --- .cvsignore | 6 +++--- erlang.spec | 18 +++++++++++++----- otp-rpath.patch | 44 ++++++++++++++++++-------------------------- sources | 6 +++--- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.cvsignore b/.cvsignore index efebe20..e3b8a63 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_doc_html_R10B-6.tar.gz -otp_doc_man_R10B-6.tar.gz -otp_src_R10B-6.tar.gz +otp_doc_html_R10B-8.tar.gz +otp_doc_man_R10B-8.tar.gz +otp_src_R10B-8.tar.gz diff --git a/erlang.spec b/erlang.spec index 15abe7b..d578362 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,20 +1,22 @@ Name: erlang Version: R10B -Release: 6.4%{?dist} +Release: 8.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R10B-6.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R10B-6.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R10B-6.tar.gz +Source: http://www.erlang.org/download/otp_src_R10B-8.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R10B-8.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R10B-8.tar.gz Patch: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, openssl-devel, flex, unixODBC-devel BuildRequires: tcl-devel, tk-devel +BuildRequires: java-1.4.2-gcj-compat-devel + Requires: tk %description @@ -33,7 +35,7 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R10B-6 +%setup -q -n otp_src_R10B-8 %patch -p1 %patch1 -p1 %patch2 -p1 @@ -90,6 +92,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Oct 29 2005 Gerard Milmeister - R10B-8.2 +- updated rpath patch + +* Sat Oct 29 2005 Gerard Milmeister - R10B-8.1 +- New Version R10B-8 + * Sat Oct 1 2005 Gerard Milmeister - R10B-6.4 - Added tk-devel and tcl-devel to buildreq - Added tk to req diff --git a/otp-rpath.patch b/otp-rpath.patch index 3c61905..9e82e62 100644 --- a/otp-rpath.patch +++ b/otp-rpath.patch @@ -1,16 +1,16 @@ ---- otp_src_R10B-3/lib/crypto/c_src/Makefile.in.rpath 2005-02-13 15:22:29.208560819 +0100 -+++ otp_src_R10B-3/lib/crypto/c_src/Makefile.in 2005-02-13 15:22:50.852106461 +0100 +--- otp_src_R10B-8/lib/crypto/c_src/Makefile.in.rpath 2005-10-29 22:50:59.000000000 +0200 ++++ otp_src_R10B-8/lib/crypto/c_src/Makefile.in 2005-10-29 22:51:23.000000000 +0200 @@ -79,7 +79,7 @@ ifeq ($(HOST_OS),) HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) endif -LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ +LD_R_FLAG= - ifeq ($(findstring @,$(LD_R_FLAG)),@) - # Old erts configure used which hasn't replaced - # @DED_LD_FLAG_RUNTIME_LIBRARY_PATH@; we try our best here instead... ---- otp_src_R10B-3/lib/crypto/priv/Makefile.rpath 2005-02-13 14:46:15.043814168 +0100 -+++ otp_src_R10B-3/lib/crypto/priv/Makefile 2005-02-13 14:46:48.575467543 +0100 + ifeq ($(strip $(LD_R_FLAG)),) + LD_R_OPT = + else +--- otp_src_R10B-8/lib/crypto/priv/Makefile.rpath 2005-10-29 22:52:01.000000000 +0200 ++++ otp_src_R10B-8/lib/crypto/priv/Makefile 2005-10-29 22:52:32.000000000 +0200 @@ -60,7 +60,7 @@ # ---------------------------------------------------- @@ -20,25 +20,17 @@ -o $@ $^ -lcrypto $(DLL_DRIVER): $(OBJS) ---- otp_src_R10B-3/lib/ssh/c_src/Makefile.in.rpath 2005-02-13 15:23:13.516486079 +0100 -+++ otp_src_R10B-3/lib/ssh/c_src/Makefile.in 2005-02-13 15:23:25.130630385 +0100 -@@ -75,7 +75,7 @@ +--- otp_src_R10B-8/lib/ssl/c_src/Makefile.in.rpath 2005-10-29 22:53:15.000000000 +0200 ++++ otp_src_R10B-8/lib/ssl/c_src/Makefile.in 2005-10-29 22:53:50.000000000 +0200 +@@ -104,9 +104,9 @@ + CC_R_FLAG = else - DYN_DRIVER = $(LIBDIR)/ssh_crypto_drv.so + ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, +-CC_R_FLAG = -Wl,-rpath, ++CC_R_FLAG = + else # Default: -Wl,-R +-CC_R_FLAG = -Wl,-R ++CC_R_FLAG = + endif endif --LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ -+LD_R_FLAG= - ifeq ($(findstring @,$(LD_R_FLAG)),@) - # Old erts configure used which hasn't replaced - # @DED_LD_FLAG_RUNTIME_LIBRARY_PATH@; we try our best here instead... ---- otp_src_R10B-3/erts/configure.rpath 2005-02-13 14:44:11.498507144 +0100 -+++ otp_src_R10B-3/erts/configure 2005-02-13 14:44:55.858437414 +0100 -@@ -1231,7 +1231,7 @@ - CFLAGS="$CFLAGS $extra_flags" - DEBUG_CFLAGS="-g $extra_flags" --CFLAG_RUNTIME_LIBRARY_PATH="-Wl,-R" -+CFLAG_RUNTIME_LIBRARY_PATH="" - case $host_os in - darwin*) - CFLAG_RUNTIME_LIBRARY_PATH= diff --git a/sources b/sources index aceac16..cecfe79 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -9f50340fd1c25af5d5a6fcf9f14b2e49 otp_doc_html_R10B-6.tar.gz -0243d2ff01fb2bac03115bcbe2284b20 otp_doc_man_R10B-6.tar.gz -6463f70b40e2a6c3587e54653add8414 otp_src_R10B-6.tar.gz +d4d3f448c311cd3fc3a44e06e4145bcb otp_doc_html_R10B-8.tar.gz +c0760f24ae789fda248e978430aefe38 otp_doc_man_R10B-8.tar.gz +75cd5ad53b66baad9ebc802b8a1f6043 otp_src_R10B-8.tar.gz -- cgit From 3b3f0be0685ff8a494ab874d5b6b2cf9b6945756 Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Thu, 18 May 2006 19:44:42 +0000 Subject: new version R11B-0 --- .cvsignore | 6 +++--- erlang.spec | 38 +++++++++++++++++++++++++------------- otp-links.patch | 20 ++++++++------------ otp-run_erl.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++ otp-sslrpath.patch | 11 +++++++++++ sources | 6 +++--- 6 files changed, 96 insertions(+), 31 deletions(-) create mode 100644 otp-run_erl.patch create mode 100644 otp-sslrpath.patch diff --git a/.cvsignore b/.cvsignore index e3b8a63..498df4a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_doc_html_R10B-8.tar.gz -otp_doc_man_R10B-8.tar.gz -otp_src_R10B-8.tar.gz +otp_src_R11B-0.tar.gz +otp_doc_html_R11B-0.tar.gz +otp_doc_man_R11B-0.tar.gz diff --git a/erlang.spec b/erlang.spec index d578362..1b43da8 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,21 +1,28 @@ Name: erlang -Version: R10B -Release: 8.2%{?dist} +Version: R11B +Release: 0.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R10B-8.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R10B-8.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R10B-8.tar.gz -Patch: otp-links.patch +Source: http://www.erlang.org/download/otp_src_R11B-0.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R11B-0.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R11B-0.tar.gz +Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch +Patch3: otp-sslrpath.patch +Patch5: otp-run_erl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel, openssl-devel, flex, unixODBC-devel -BuildRequires: tcl-devel, tk-devel + +BuildRequires: ncurses-devel +BuildRequires: openssl-devel +BuildRequires: unixODBC-devel +BuildRequires: tcl-devel +BuildRequires: tk-devel BuildRequires: java-1.4.2-gcj-compat-devel +BuildRequires: flex Requires: tk @@ -35,10 +42,12 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R10B-8 -%patch -p1 -%patch1 -p1 -%patch2 -p1 +%setup -q -n otp_src_R11B-0 +%patch0 -p1 -b .links +%patch1 -p1 -b .install +%patch2 -p1 -b .rpath +%patch3 -p1 -b .sslrpath +%patch5 -p1 -b .run_erl %build @@ -88,10 +97,13 @@ rm -rf $RPM_BUILD_ROOT %post -%{_libdir}/erlang/Install -minimal %{_libdir}/erlang > /dev/null +%{_libdir}/erlang/Install -minimal %{_libdir}/erlang >/dev/null 2>/dev/null %changelog +* Thu May 18 2006 Gerard Milmeister - R11B-0.1 +- new version R11B-0 + * Sat Oct 29 2005 Gerard Milmeister - R10B-8.2 - updated rpath patch diff --git a/otp-links.patch b/otp-links.patch index f313c85..6c8b227 100644 --- a/otp-links.patch +++ b/otp-links.patch @@ -1,17 +1,13 @@ ---- otp_src_R9C-0/Makefile.in.links 2003-10-17 12:49:41.000000000 +0200 -+++ otp_src_R9C-0/Makefile.in 2003-10-17 12:50:07.000000000 +0200 -@@ -505,14 +505,6 @@ - # Erlang base public files +--- otp_src_R11B-0/Makefile.in.links 2006-05-12 16:43:44.000000000 +0200 ++++ otp_src_R11B-0/Makefile.in 2006-05-18 20:27:56.000000000 +0200 +@@ -545,10 +545,6 @@ + # Install erlang base public files # install.bin: -- rm -f $(BINDIR)/erl $(BINDIR)/erlc \ -- $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/ear $(BINDIR)/escript -- ${LN_S} $(ERLANG_BINDIR)/erl $(BINDIR)/erl -- ${LN_S} $(ERLANG_BINDIR)/erlc $(BINDIR)/erlc -- ${LN_S} $(ERLANG_BINDIR)/ecc $(BINDIR)/ecc -- ${LN_S} $(ERLANG_BINDIR)/elink $(BINDIR)/elink -- ${LN_S} $(ERLANG_BINDIR)/ear $(BINDIR)/ear -- ${LN_S} $(ERLANG_BINDIR)/escript $(BINDIR)/escript +- for file in $(ERL_BASE_PUB_FILES); do \ +- rm -f $(BINDIR)/$$file; \ +- ${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \ +- done # # Directories needed before we can install diff --git a/otp-run_erl.patch b/otp-run_erl.patch new file mode 100644 index 0000000..7629a75 --- /dev/null +++ b/otp-run_erl.patch @@ -0,0 +1,46 @@ +--- otp_src_R10B-10/erts/etc/unix/run_erl.c.bak 2006-05-03 15:54:19.000000000 +0200 ++++ otp_src_R10B-10/erts/etc/unix/run_erl.c 2006-05-03 15:57:36.000000000 +0200 +@@ -42,6 +42,8 @@ + #include + #include + #include ++#include ++#include + #if !defined(NO_SYSLOG) + #include + #endif +@@ -803,6 +805,7 @@ + static int open_pty_master(char **ptyslave) + { + int mfd; ++ int sfd; + char *major, *minor; + + static char majorchars[] = "pqrstuvwxyzabcdePQRSTUVWXYZABCDE"; +@@ -818,6 +821,15 @@ + /* http://www.xcf.berkeley.edu/~ali/K0D/UNIX/PTY/code/upty.h.html */ + + { ++ static char ttyname[] = " "; ++ if (0 == openpty(&mfd, &sfd, ttyname, NULL, NULL)) { ++ close(sfd); ++ *ptyslave = ttyname; ++ return mfd; ++ } ++ } ++ ++ { + /* New style devpts or devfs /dev/pty/{m,s}{0,1....} */ + + static char ptyname[] = "/dev/pty/mX"; +--- otp_src_R10B-10/erts/etc/common/Makefile.in.orig 2006-05-03 17:08:53.000000000 +0200 ++++ otp_src_R10B-10/erts/etc/common/Makefile.in 2006-05-03 17:10:18.000000000 +0200 +@@ -241,7 +241,7 @@ + $(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) + + $(BINDIR)/run_erl: $(OBJDIR)/run_erl.o +- $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o ++ $(LD) $(LDFLAGS) -lutil -o $@ $(OBJDIR)/run_erl.o + + $(OBJDIR)/run_erl.o: ../unix/run_erl.c + $(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c diff --git a/otp-sslrpath.patch b/otp-sslrpath.patch new file mode 100644 index 0000000..83ba120 --- /dev/null +++ b/otp-sslrpath.patch @@ -0,0 +1,11 @@ +--- otp_src_R10B-9/lib/ssl/c_src/Makefile.in.sslrpath 2005-12-29 00:49:17.000000000 +0100 ++++ otp_src_R10B-9/lib/ssl/c_src/Makefile.in 2005-12-29 00:50:15.000000000 +0100 +@@ -95,7 +95,7 @@ + endif + endif + +-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ ++CC_R_FLAG= + ifeq ($(findstring @,$(CC_R_FLAG)),@) + # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; + # we try our best here instead... diff --git a/sources b/sources index cecfe79..713b3df 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -d4d3f448c311cd3fc3a44e06e4145bcb otp_doc_html_R10B-8.tar.gz -c0760f24ae789fda248e978430aefe38 otp_doc_man_R10B-8.tar.gz -75cd5ad53b66baad9ebc802b8a1f6043 otp_src_R10B-8.tar.gz +367d9d3ba979cd278b78d6d0393982ba otp_src_R11B-0.tar.gz +8d163f4d16c98ba2e979688842a55a9f otp_doc_html_R11B-0.tar.gz +172591538db42e81b814a77f30da4fa4 otp_doc_man_R11B-0.tar.gz -- cgit From ae126d7dd88477eaf083e6c5f22783155cda456a Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 15:14:33 +0000 Subject: Initialize branch FC-6 for erlang --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 -- cgit From a04765aa860c3e35e676199d4a8a22d27e23bfad Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sat, 30 Dec 2006 22:24:45 +0000 Subject: new version R11B-2 --- .cvsignore | 6 +++--- erlang.spec | 13 ++++++++----- sources | 6 +++--- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index 498df4a..013e93f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_src_R11B-0.tar.gz -otp_doc_html_R11B-0.tar.gz -otp_doc_man_R11B-0.tar.gz +otp_src_R11B-2.tar.gz +otp_doc_html_R11B-2.tar.gz +otp_doc_man_R11B-2.tar.gz diff --git a/erlang.spec b/erlang.spec index b911182..6f0ed52 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,14 +1,14 @@ Name: erlang Version: R11B -Release: 0.3%{?dist} +Release: 2.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R11B-0.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R11B-0.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R11B-0.tar.gz +Source: http://www.erlang.org/download/otp_src_R11B-2.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R11B-2.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R11B-2.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch @@ -43,7 +43,7 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R11B-0 +%setup -q -n otp_src_R11B-2 %patch0 -p1 -b .links %patch1 -p1 -b .install %patch2 -p1 -b .rpath @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Dec 30 2006 Gerard Milmeister - R11B-2.1 +- new version R11B-2 + * Mon Aug 28 2006 Gerard Milmeister - R11B-0.3 - Rebuild for FE6 diff --git a/sources b/sources index 713b3df..c88cf68 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -367d9d3ba979cd278b78d6d0393982ba otp_src_R11B-0.tar.gz -8d163f4d16c98ba2e979688842a55a9f otp_doc_html_R11B-0.tar.gz -172591538db42e81b814a77f30da4fa4 otp_doc_man_R11B-0.tar.gz +7d7cca1d2f392a8a317cb4c0bd904726 otp_src_R11B-2.tar.gz +e2c45ced77ec63b9b1dd95c8f5396f7d otp_doc_html_R11B-2.tar.gz +c81023f591c1bace836de3aa874f3c2a otp_doc_man_R11B-2.tar.gz -- cgit From b51b30d126d1a9713d6a50ba726aaf7a591a0e49 Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sat, 30 Dec 2006 22:24:45 +0000 Subject: new version R11B-2 --- .cvsignore | 6 +++--- erlang.spec | 13 ++++++++----- sources | 6 +++--- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index 498df4a..013e93f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_src_R11B-0.tar.gz -otp_doc_html_R11B-0.tar.gz -otp_doc_man_R11B-0.tar.gz +otp_src_R11B-2.tar.gz +otp_doc_html_R11B-2.tar.gz +otp_doc_man_R11B-2.tar.gz diff --git a/erlang.spec b/erlang.spec index b911182..6f0ed52 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,14 +1,14 @@ Name: erlang Version: R11B -Release: 0.3%{?dist} +Release: 2.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R11B-0.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R11B-0.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R11B-0.tar.gz +Source: http://www.erlang.org/download/otp_src_R11B-2.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R11B-2.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R11B-2.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch @@ -43,7 +43,7 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R11B-0 +%setup -q -n otp_src_R11B-2 %patch0 -p1 -b .links %patch1 -p1 -b .install %patch2 -p1 -b .rpath @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Dec 30 2006 Gerard Milmeister - R11B-2.1 +- new version R11B-2 + * Mon Aug 28 2006 Gerard Milmeister - R11B-0.3 - Rebuild for FE6 diff --git a/sources b/sources index 713b3df..c88cf68 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -367d9d3ba979cd278b78d6d0393982ba otp_src_R11B-0.tar.gz -8d163f4d16c98ba2e979688842a55a9f otp_doc_html_R11B-0.tar.gz -172591538db42e81b814a77f30da4fa4 otp_doc_man_R11B-0.tar.gz +7d7cca1d2f392a8a317cb4c0bd904726 otp_src_R11B-2.tar.gz +e2c45ced77ec63b9b1dd95c8f5396f7d otp_doc_html_R11B-2.tar.gz +c81023f591c1bace836de3aa874f3c2a otp_doc_man_R11B-2.tar.gz -- cgit From 02f93e425a0c7366b9a12c6b4095216064599d85 Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sat, 30 Dec 2006 23:46:59 +0000 Subject: new version R11B-2 --- erlang.spec | 7 ++++++- otp-glibc24.patch | 11 ----------- otp-glibc25.patch | 11 +++++++++++ 3 files changed, 17 insertions(+), 12 deletions(-) delete mode 100644 otp-glibc24.patch create mode 100644 otp-glibc25.patch diff --git a/erlang.spec b/erlang.spec index 6f0ed52..e76683d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,6 +1,6 @@ Name: erlang Version: R11B -Release: 2.1%{?dist} +Release: 2.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -13,6 +13,7 @@ Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch +Patch4: otp-glibc25.patch Patch5: otp-run_erl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -48,6 +49,7 @@ Documentation for Erlang. %patch1 -p1 -b .install %patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath +%patch4 -p1 -b .glibc25 %patch5 -p1 -b .run_erl @@ -102,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Dec 30 2006 Gerard Milmeister - R11B-2.2 +- added patch for compiling with glibc 2.5 + * Sat Dec 30 2006 Gerard Milmeister - R11B-2.1 - new version R11B-2 diff --git a/otp-glibc24.patch b/otp-glibc24.patch deleted file mode 100644 index 4875e65..0000000 --- a/otp-glibc24.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- otp_src_R10B-10/erts/emulator/hipe/hipe_x86_signal.c.glibc24 2006-03-13 17:16:39.000000000 +0100 -+++ otp_src_R10B-10/erts/emulator/hipe/hipe_x86_signal.c 2006-03-13 17:17:11.000000000 +0100 -@@ -27,7 +27,7 @@ - #include - #include "hipe_signal.h" - --#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 3 -+#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 4 - /* See comment below for glibc 2.2. */ - #ifndef __USE_GNU - #define __USE_GNU /* to un-hide RTLD_NEXT */ diff --git a/otp-glibc25.patch b/otp-glibc25.patch new file mode 100644 index 0000000..b9d849d --- /dev/null +++ b/otp-glibc25.patch @@ -0,0 +1,11 @@ +--- otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c.glibc25 2006-12-30 23:57:04.000000000 +0100 ++++ otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c 2006-12-30 23:57:36.000000000 +0100 +@@ -34,7 +34,7 @@ + #endif + #include "hipe_signal.h" + +-#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4) ++#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4 || __GLIBC_MINOR__ == 5) + /* See comment below for glibc 2.2. */ + #ifndef __USE_GNU + #define __USE_GNU /* to un-hide RTLD_NEXT */ -- cgit From 864400264ba55995865a60b6848994574466a66a Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sat, 30 Dec 2006 23:46:59 +0000 Subject: new version R11B-2 --- erlang.spec | 7 ++++++- otp-glibc24.patch | 11 ----------- otp-glibc25.patch | 11 +++++++++++ 3 files changed, 17 insertions(+), 12 deletions(-) delete mode 100644 otp-glibc24.patch create mode 100644 otp-glibc25.patch diff --git a/erlang.spec b/erlang.spec index 6f0ed52..e76683d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,6 +1,6 @@ Name: erlang Version: R11B -Release: 2.1%{?dist} +Release: 2.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -13,6 +13,7 @@ Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch +Patch4: otp-glibc25.patch Patch5: otp-run_erl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -48,6 +49,7 @@ Documentation for Erlang. %patch1 -p1 -b .install %patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath +%patch4 -p1 -b .glibc25 %patch5 -p1 -b .run_erl @@ -102,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Dec 30 2006 Gerard Milmeister - R11B-2.2 +- added patch for compiling with glibc 2.5 + * Sat Dec 30 2006 Gerard Milmeister - R11B-2.1 - new version R11B-2 diff --git a/otp-glibc24.patch b/otp-glibc24.patch deleted file mode 100644 index 4875e65..0000000 --- a/otp-glibc24.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- otp_src_R10B-10/erts/emulator/hipe/hipe_x86_signal.c.glibc24 2006-03-13 17:16:39.000000000 +0100 -+++ otp_src_R10B-10/erts/emulator/hipe/hipe_x86_signal.c 2006-03-13 17:17:11.000000000 +0100 -@@ -27,7 +27,7 @@ - #include - #include "hipe_signal.h" - --#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 3 -+#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 4 - /* See comment below for glibc 2.2. */ - #ifndef __USE_GNU - #define __USE_GNU /* to un-hide RTLD_NEXT */ diff --git a/otp-glibc25.patch b/otp-glibc25.patch new file mode 100644 index 0000000..b9d849d --- /dev/null +++ b/otp-glibc25.patch @@ -0,0 +1,11 @@ +--- otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c.glibc25 2006-12-30 23:57:04.000000000 +0100 ++++ otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c 2006-12-30 23:57:36.000000000 +0100 +@@ -34,7 +34,7 @@ + #endif + #include "hipe_signal.h" + +-#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4) ++#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4 || __GLIBC_MINOR__ == 5) + /* See comment below for glibc 2.2. */ + #ifndef __USE_GNU + #define __USE_GNU /* to un-hide RTLD_NEXT */ -- cgit From 4c305f68e86e9e33792c8a16c0bf5a3b043f7b15 Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sun, 31 Dec 2006 10:18:43 +0000 Subject: *** empty log message *** --- erlang.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index e76683d..8c15b57 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,6 +1,6 @@ Name: erlang Version: R11B -Release: 2.2%{?dist} +Release: 2.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -82,6 +82,10 @@ 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} + %clean rm -rf $RPM_BUILD_ROOT @@ -104,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Dec 31 2006 Gerard Milmeister - R11B-2.3 +- remove buildroot from installed files + * Sat Dec 30 2006 Gerard Milmeister - R11B-2.2 - added patch for compiling with glibc 2.5 -- cgit From f67b8e53fdec6469e61c5bbb4510b2e7f49dd089 Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sun, 31 Dec 2006 10:18:43 +0000 Subject: *** empty log message *** --- erlang.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index e76683d..8c15b57 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,6 +1,6 @@ Name: erlang Version: R11B -Release: 2.2%{?dist} +Release: 2.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -82,6 +82,10 @@ 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} + %clean rm -rf $RPM_BUILD_ROOT @@ -104,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Dec 31 2006 Gerard Milmeister - R11B-2.3 +- remove buildroot from installed files + * Sat Dec 30 2006 Gerard Milmeister - R11B-2.2 - added patch for compiling with glibc 2.5 -- cgit From 4804b34496c0c1baabd69282a7cabf665c172663 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 03:48:35 +0000 Subject: Initialize branch F-7 for erlang --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 -- cgit From 96f9fd7d178d8028051c69e77aea8173a9d6b419 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 10 Aug 2007 16:50:06 +0000 Subject: Initialize branch EL-4 for erlang --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..6ec5cef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-4 -- cgit From 04e99ff8cba8690db0228a73cbcfef14025fb6f8 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 10 Aug 2007 16:50:24 +0000 Subject: Initialize branch EL-5 for erlang --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 -- cgit From 0bf650d201173da5c153c7bac9f6aa40a53a6c0b Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 7 Oct 2007 08:23:11 +0000 Subject: Added missing BR for EL-4 - m4 --- erlang.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 1b43da8..c49ea4a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,6 +1,6 @@ Name: erlang Version: R11B -Release: 0.1%{?dist} +Release: 0.1.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -23,6 +23,7 @@ BuildRequires: tcl-devel BuildRequires: tk-devel BuildRequires: java-1.4.2-gcj-compat-devel BuildRequires: flex +BuildRequires: m4 Requires: tk @@ -101,6 +102,10 @@ rm -rf $RPM_BUILD_ROOT %changelog + +* Sun Oct 7 2007 Peter Lemenkov - R11B-0.1.1 +- Added missing BR for EL-4 - m4 + * Thu May 18 2006 Gerard Milmeister - R11B-0.1 - new version R11B-0 -- cgit From 6190378e21ada9e81efc850d13b6ea2256731759 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 7 Oct 2007 08:32:59 +0000 Subject: Rev. R11B-2.3 --- erlang.spec | 42 ++++++++++++++++++++++++++++++++++-------- otp-glibc25.patch | 11 +++++++++++ sources | 6 +++--- 3 files changed, 48 insertions(+), 11 deletions(-) create mode 100644 otp-glibc25.patch diff --git a/erlang.spec b/erlang.spec index c49ea4a..8c15b57 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,18 +1,19 @@ Name: erlang Version: R11B -Release: 0.1.1%{?dist} +Release: 2.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R11B-0.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R11B-0.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R11B-0.tar.gz +Source: http://www.erlang.org/download/otp_src_R11B-2.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R11B-2.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R11B-2.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch +Patch4: otp-glibc25.patch Patch5: otp-run_erl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,7 +24,7 @@ BuildRequires: tcl-devel BuildRequires: tk-devel BuildRequires: java-1.4.2-gcj-compat-devel BuildRequires: flex -BuildRequires: m4 +BuildRequires: m4 Requires: tk @@ -43,11 +44,12 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R11B-0 +%setup -q -n otp_src_R11B-2 %patch0 -p1 -b .links %patch1 -p1 -b .install %patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath +%patch4 -p1 -b .glibc25 %patch5 -p1 -b .run_erl @@ -80,6 +82,10 @@ 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} + %clean rm -rf $RPM_BUILD_ROOT @@ -102,13 +108,33 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Dec 31 2006 Gerard Milmeister - R11B-2.3 +- remove buildroot from installed files + +* Sat Dec 30 2006 Gerard Milmeister - R11B-2.2 +- added patch for compiling with glibc 2.5 + +* Sat Dec 30 2006 Gerard Milmeister - R11B-2.1 +- new version R11B-2 + +* Mon Aug 28 2006 Gerard Milmeister - R11B-0.3 +- Rebuild for FE6 -* Sun Oct 7 2007 Peter Lemenkov - R11B-0.1.1 -- Added missing BR for EL-4 - m4 +* Wed Jul 5 2006 Gerard Milmeister - R11B-0.2 +- add BR m4 * Thu May 18 2006 Gerard Milmeister - R11B-0.1 - new version R11B-0 +* Wed May 3 2006 Gerard Milmeister - R10B-10.3 +- added patch for run_erl by Knut-Håvard Aksnes + +* Mon Mar 13 2006 Gerard Milmeister - R10B-10.1 +- new version R10B-10 + +* Thu Dec 29 2005 Gerard Milmeister - R10B-9.1 +- New Version R10B-9 + * Sat Oct 29 2005 Gerard Milmeister - R10B-8.2 - updated rpath patch diff --git a/otp-glibc25.patch b/otp-glibc25.patch new file mode 100644 index 0000000..b9d849d --- /dev/null +++ b/otp-glibc25.patch @@ -0,0 +1,11 @@ +--- otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c.glibc25 2006-12-30 23:57:04.000000000 +0100 ++++ otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c 2006-12-30 23:57:36.000000000 +0100 +@@ -34,7 +34,7 @@ + #endif + #include "hipe_signal.h" + +-#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4) ++#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4 || __GLIBC_MINOR__ == 5) + /* See comment below for glibc 2.2. */ + #ifndef __USE_GNU + #define __USE_GNU /* to un-hide RTLD_NEXT */ diff --git a/sources b/sources index 713b3df..c88cf68 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -367d9d3ba979cd278b78d6d0393982ba otp_src_R11B-0.tar.gz -8d163f4d16c98ba2e979688842a55a9f otp_doc_html_R11B-0.tar.gz -172591538db42e81b814a77f30da4fa4 otp_doc_man_R11B-0.tar.gz +7d7cca1d2f392a8a317cb4c0bd904726 otp_src_R11B-2.tar.gz +e2c45ced77ec63b9b1dd95c8f5396f7d otp_doc_html_R11B-2.tar.gz +c81023f591c1bace836de3aa874f3c2a otp_doc_man_R11B-2.tar.gz -- cgit From 18726b8861b407c1a9641c6cf4dff4d6b5581ec2 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 20 Oct 2007 05:47:09 +0000 Subject: Initialize branch F-8 for erlang --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 -- cgit From b2ed6add2b3cb6345554a48c5eaac21fd11a10a8 Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sat, 8 Dec 2007 12:13:23 +0000 Subject: new release R11B-0 --- .cvsignore | 6 +++--- erlang.spec | 20 +++++++++++++------- sources | 6 +++--- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3199789..bf57fee 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_src_R11B-5.tar.gz -otp_doc_html_R11B-5.tar.gz -otp_doc_man_R11B-5.tar.gz +otp_src_R12B-0.tar.gz +otp_doc_man_R12B-0.tar.gz +otp_doc_html_R12B-0.tar.gz diff --git a/erlang.spec b/erlang.spec index 04f2609..a93b224 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,14 +1,14 @@ Name: erlang -Version: R11B -Release: 5.3%{?dist} +Version: R12B +Release: 0.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R11B-5.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R11B-5.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R11B-5.tar.gz +Source: http://www.erlang.org/download/otp_src_R12B-0.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R12B-0.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R12B-0.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch @@ -42,14 +42,14 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R11B-5 +%setup -q -n otp_src_R12B-0 %patch0 -p1 -b .links %patch1 -p1 -b .install %patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath # enable dynamic linking for ssl sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure - +sed -i 's|LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile %build ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} @@ -107,6 +107,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Dec 8 2007 Gerard Milmeister - R12B-0.1 +- new release R12B-0 + +* Wed Dec 05 2007 Release Engineering - R11B-6 + - Rebuild for deps + * Sun Aug 19 2007 Gerard Milmeister - R11B-5.3 - fix some permissions diff --git a/sources b/sources index 74f7f14..308744f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -96acec41da87d6ee0ef18e1aab36ffdd otp_src_R11B-5.tar.gz -6a40146d855f98d024682cd24e9bb5bc otp_doc_html_R11B-5.tar.gz -5c387162ae6d255f525d72a91481d135 otp_doc_man_R11B-5.tar.gz +54cd5a83697c515f571e44d4ea99c8d3 otp_src_R12B-0.tar.gz +aa3a12a16e03d1aadec40e265f51e7c6 otp_doc_man_R12B-0.tar.gz +ddbb484ebe97a837640e51305cc7557a otp_doc_html_R12B-0.tar.gz -- cgit From ac32b15c85831ee6cf913f1b40b175b2dab42d07 Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sat, 8 Dec 2007 12:16:03 +0000 Subject: new release R11B-0 --- erlang.spec | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/erlang.spec b/erlang.spec index c27b34f..a4faf5d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -6,15 +6,13 @@ Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R11B-2.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R11B-2.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R11B-2.tar.gz +Source: http://www.erlang.org/download/otp_src_R12B-0.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R12B-0.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R12B-0.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch -Patch4: otp-glibc25.patch -Patch5: otp-run_erl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -44,14 +42,14 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R11B-2 +%setup -q -n otp_src_R12B-0 %patch0 -p1 -b .links %patch1 -p1 -b .install %patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath -%patch4 -p1 -b .glibc25 -%patch5 -p1 -b .run_erl - +# enable dynamic linking for ssl +sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure +sed -i 's|LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile %build ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} @@ -66,6 +64,7 @@ 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 @@ -108,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Dec 8 2007 Gerard Milmeister - R12B-0.1 +- new release R12B-0 + * Sat Mar 24 2007 Thomas Fitzsimmons - R11B-2.4 - Require java-1.5.0-gcj-devel for build. -- cgit From 8033f1af19e5bf434a78fbb28d311ee785fc68a8 Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sat, 8 Dec 2007 12:18:21 +0000 Subject: new release R11B-0 --- erlang.spec | 4 ++-- sources | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/erlang.spec b/erlang.spec index a4faf5d..3cc67fb 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,6 +1,6 @@ Name: erlang -Version: R11B -Release: 2.4%{?dist} +Version: R12B +Release: 0.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages diff --git a/sources b/sources index c88cf68..308744f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -7d7cca1d2f392a8a317cb4c0bd904726 otp_src_R11B-2.tar.gz -e2c45ced77ec63b9b1dd95c8f5396f7d otp_doc_html_R11B-2.tar.gz -c81023f591c1bace836de3aa874f3c2a otp_doc_man_R11B-2.tar.gz +54cd5a83697c515f571e44d4ea99c8d3 otp_src_R12B-0.tar.gz +aa3a12a16e03d1aadec40e265f51e7c6 otp_doc_man_R12B-0.tar.gz +ddbb484ebe97a837640e51305cc7557a otp_doc_html_R12B-0.tar.gz -- cgit From fb3dafbc7a97d97f3adc8186ea1979b856744582 Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sat, 23 Feb 2008 13:41:16 +0000 Subject: disable strict aliasing optimization --- erlang.spec | 10 ++++++++-- otp-glibc25.patch | 11 ----------- otp-null.patch | 11 +++++++++++ otp-run_erl.patch | 46 ---------------------------------------------- 4 files changed, 19 insertions(+), 59 deletions(-) delete mode 100644 otp-glibc25.patch create mode 100644 otp-null.patch delete mode 100644 otp-run_erl.patch diff --git a/erlang.spec b/erlang.spec index 0e6437e..78b81b9 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,6 +1,6 @@ Name: erlang Version: R12B -Release: 0.2%{?dist} +Release: 0.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -13,6 +13,7 @@ Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch +Patch4: otp-null.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -20,6 +21,7 @@ BuildRequires: openssl-devel BuildRequires: unixODBC-devel BuildRequires: tcl-devel BuildRequires: tk-devel +BuildRequires: gd-devel BuildRequires: java-1.5.0-gcj-devel BuildRequires: flex BuildRequires: m4 @@ -47,12 +49,13 @@ Documentation for Erlang. %patch1 -p1 -b .install %patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath +%patch4 -p1 -b .null # enable dynamic linking for ssl sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure sed -i 's|LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile %build -./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} chmod -R u+w . make @@ -107,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Feb 23 2008 Gerard Milmeister - R12B-0.3 +- disable strict aliasing optimization + * Mon Feb 18 2008 Fedora Release Engineering - R12B-0.2 - Autorebuild for GCC 4.3 diff --git a/otp-glibc25.patch b/otp-glibc25.patch deleted file mode 100644 index b9d849d..0000000 --- a/otp-glibc25.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c.glibc25 2006-12-30 23:57:04.000000000 +0100 -+++ otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c 2006-12-30 23:57:36.000000000 +0100 -@@ -34,7 +34,7 @@ - #endif - #include "hipe_signal.h" - --#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4) -+#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4 || __GLIBC_MINOR__ == 5) - /* See comment below for glibc 2.2. */ - #ifndef __USE_GNU - #define __USE_GNU /* to un-hide RTLD_NEXT */ diff --git a/otp-null.patch b/otp-null.patch new file mode 100644 index 0000000..b84d499 --- /dev/null +++ b/otp-null.patch @@ -0,0 +1,11 @@ +diff -up otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c.null otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c +--- otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c.null 2008-02-23 13:46:52.000000000 +0100 ++++ otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c 2008-02-23 13:47:15.000000000 +0100 +@@ -17,6 +17,7 @@ + * $Id: otp-null.patch,v 1.1 2008/02/23 13:41:16 gemi Exp $ + * + */ ++#include + #include "inet.h" + + #ifdef HAVE_CONFIG_H diff --git a/otp-run_erl.patch b/otp-run_erl.patch deleted file mode 100644 index 7629a75..0000000 --- a/otp-run_erl.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- otp_src_R10B-10/erts/etc/unix/run_erl.c.bak 2006-05-03 15:54:19.000000000 +0200 -+++ otp_src_R10B-10/erts/etc/unix/run_erl.c 2006-05-03 15:57:36.000000000 +0200 -@@ -42,6 +42,8 @@ - #include - #include - #include -+#include -+#include - #if !defined(NO_SYSLOG) - #include - #endif -@@ -803,6 +805,7 @@ - static int open_pty_master(char **ptyslave) - { - int mfd; -+ int sfd; - char *major, *minor; - - static char majorchars[] = "pqrstuvwxyzabcdePQRSTUVWXYZABCDE"; -@@ -818,6 +821,15 @@ - /* http://www.xcf.berkeley.edu/~ali/K0D/UNIX/PTY/code/upty.h.html */ - - { -+ static char ttyname[] = " "; -+ if (0 == openpty(&mfd, &sfd, ttyname, NULL, NULL)) { -+ close(sfd); -+ *ptyslave = ttyname; -+ return mfd; -+ } -+ } -+ -+ { - /* New style devpts or devfs /dev/pty/{m,s}{0,1....} */ - - static char ptyname[] = "/dev/pty/mX"; ---- otp_src_R10B-10/erts/etc/common/Makefile.in.orig 2006-05-03 17:08:53.000000000 +0200 -+++ otp_src_R10B-10/erts/etc/common/Makefile.in 2006-05-03 17:10:18.000000000 +0200 -@@ -241,7 +241,7 @@ - $(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) - - $(BINDIR)/run_erl: $(OBJDIR)/run_erl.o -- $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o -+ $(LD) $(LDFLAGS) -lutil -o $@ $(OBJDIR)/run_erl.o - - $(OBJDIR)/run_erl.o: ../unix/run_erl.c - $(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c -- cgit From 74bffd2813ba1a4a3339667692ea45bff236084f Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Thu, 27 Mar 2008 15:19:25 +0000 Subject: new release R12B-1 --- .cvsignore | 6 +++--- erlang.spec | 15 +++++++++------ sources | 6 +++--- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.cvsignore b/.cvsignore index 013e93f..750bfae 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_src_R11B-2.tar.gz -otp_doc_html_R11B-2.tar.gz -otp_doc_man_R11B-2.tar.gz +otp_src_R12B-1.tar.gz +otp_doc_man_R12B-1.tar.gz +otp_doc_html_R12B-1.tar.gz diff --git a/erlang.spec b/erlang.spec index 3cc67fb..16a86b7 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,14 +1,14 @@ Name: erlang Version: R12B -Release: 0.1%{?dist} +Release: 1.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R12B-0.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R12B-0.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R12B-0.tar.gz +Source: http://www.erlang.org/download/otp_src_R12B-1.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R12B-1.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R12B-1.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch @@ -42,14 +42,14 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R12B-0 +%setup -q -n otp_src_R12B-1 %patch0 -p1 -b .links %patch1 -p1 -b .install %patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath # enable dynamic linking for ssl sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure -sed -i 's|LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile +sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile %build ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} @@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 27 2008 Gerard Milmeister - R12B-1.1 +- new release R12B-1 + * Sat Dec 8 2007 Gerard Milmeister - R12B-0.1 - new release R12B-0 diff --git a/sources b/sources index 308744f..0c7d74f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -54cd5a83697c515f571e44d4ea99c8d3 otp_src_R12B-0.tar.gz -aa3a12a16e03d1aadec40e265f51e7c6 otp_doc_man_R12B-0.tar.gz -ddbb484ebe97a837640e51305cc7557a otp_doc_html_R12B-0.tar.gz +6de3630b446e9c2150edfe01e383c917 otp_src_R12B-1.tar.gz +96da62bcfb40e5d3ec2945bb2b050024 otp_doc_man_R12B-1.tar.gz +3dd8aee17fcbd3e5fda7313208fce6ac otp_doc_html_R12B-1.tar.gz -- cgit From f6bb1d6e5e3c2b4f06cd1f93547e55517258b687 Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Thu, 27 Mar 2008 15:25:52 +0000 Subject: new release R12B-1 --- .cvsignore | 6 +++--- erlang.spec | 15 +++++++++------ sources | 6 +++--- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.cvsignore b/.cvsignore index bf57fee..750bfae 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_src_R12B-0.tar.gz -otp_doc_man_R12B-0.tar.gz -otp_doc_html_R12B-0.tar.gz +otp_src_R12B-1.tar.gz +otp_doc_man_R12B-1.tar.gz +otp_doc_html_R12B-1.tar.gz diff --git a/erlang.spec b/erlang.spec index a93b224..38cc2e2 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,14 +1,14 @@ Name: erlang Version: R12B -Release: 0.1%{?dist} +Release: 1.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R12B-0.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R12B-0.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R12B-0.tar.gz +Source: http://www.erlang.org/download/otp_src_R12B-1.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R12B-1.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R12B-1.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch @@ -42,14 +42,14 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R12B-0 +%setup -q -n otp_src_R12B-1 %patch0 -p1 -b .links %patch1 -p1 -b .install %patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath # enable dynamic linking for ssl sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure -sed -i 's|LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile +sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile %build ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} @@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 27 2008 Gerard Milmeister - R12B-1.1 +- new release R12B-1 + * Sat Dec 8 2007 Gerard Milmeister - R12B-0.1 - new release R12B-0 diff --git a/sources b/sources index 308744f..0c7d74f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -54cd5a83697c515f571e44d4ea99c8d3 otp_src_R12B-0.tar.gz -aa3a12a16e03d1aadec40e265f51e7c6 otp_doc_man_R12B-0.tar.gz -ddbb484ebe97a837640e51305cc7557a otp_doc_html_R12B-0.tar.gz +6de3630b446e9c2150edfe01e383c917 otp_src_R12B-1.tar.gz +96da62bcfb40e5d3ec2945bb2b050024 otp_doc_man_R12B-1.tar.gz +3dd8aee17fcbd3e5fda7313208fce6ac otp_doc_html_R12B-1.tar.gz -- cgit From 28b433e52a7e5eb8cf30454adf8da436ac8779c1 Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Thu, 27 Mar 2008 15:26:08 +0000 Subject: new release R12B-1 --- .cvsignore | 6 +++--- erlang.spec | 15 +++++++++------ sources | 6 +++--- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.cvsignore b/.cvsignore index bf57fee..750bfae 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_src_R12B-0.tar.gz -otp_doc_man_R12B-0.tar.gz -otp_doc_html_R12B-0.tar.gz +otp_src_R12B-1.tar.gz +otp_doc_man_R12B-1.tar.gz +otp_doc_html_R12B-1.tar.gz diff --git a/erlang.spec b/erlang.spec index 78b81b9..a37a4d1 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,14 +1,14 @@ Name: erlang Version: R12B -Release: 0.3%{?dist} +Release: 1.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R12B-0.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R12B-0.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R12B-0.tar.gz +Source: http://www.erlang.org/download/otp_src_R12B-1.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R12B-1.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R12B-1.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch @@ -44,7 +44,7 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R12B-0 +%setup -q -n otp_src_R12B-1 %patch0 -p1 -b .links %patch1 -p1 -b .install %patch2 -p1 -b .rpath @@ -52,7 +52,7 @@ Documentation for Erlang. %patch4 -p1 -b .null # enable dynamic linking for ssl sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure -sed -i 's|LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile +sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile %build CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 27 2008 Gerard Milmeister - R12B-1.1 +- new release R12B-1 + * Sat Feb 23 2008 Gerard Milmeister - R12B-0.3 - disable strict aliasing optimization diff --git a/sources b/sources index 308744f..0c7d74f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -54cd5a83697c515f571e44d4ea99c8d3 otp_src_R12B-0.tar.gz -aa3a12a16e03d1aadec40e265f51e7c6 otp_doc_man_R12B-0.tar.gz -ddbb484ebe97a837640e51305cc7557a otp_doc_html_R12B-0.tar.gz +6de3630b446e9c2150edfe01e383c917 otp_src_R12B-1.tar.gz +96da62bcfb40e5d3ec2945bb2b050024 otp_doc_man_R12B-1.tar.gz +3dd8aee17fcbd3e5fda7313208fce6ac otp_doc_html_R12B-1.tar.gz -- cgit From 6f361b1c0dde9ff3a19f3988e9cddc940cb26d76 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 27 Mar 2008 19:00:29 +0000 Subject: Ver. R12B-1 --- .cvsignore | 6 +++--- erlang.spec | 21 ++++++++++++--------- otp-glibc25.patch | 11 ----------- otp-run_erl.patch | 45 +++++---------------------------------------- otp-ssl_missing_libs.patch | 11 +++++++++++ sources | 6 +++--- 6 files changed, 34 insertions(+), 66 deletions(-) delete mode 100644 otp-glibc25.patch create mode 100644 otp-ssl_missing_libs.patch diff --git a/.cvsignore b/.cvsignore index 013e93f..eb1a5f9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_src_R11B-2.tar.gz -otp_doc_html_R11B-2.tar.gz -otp_doc_man_R11B-2.tar.gz +otp_doc_html_R12B-1.tar.gz +otp_doc_man_R12B-1.tar.gz +otp_src_R12B-1.tar.gz diff --git a/erlang.spec b/erlang.spec index 8c15b57..4b65ec7 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,20 +1,20 @@ Name: erlang -Version: R11B -Release: 2.3%{?dist} +Version: R12B +Release: 1.0%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R11B-2.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R11B-2.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R11B-2.tar.gz +Source: http://www.erlang.org/download/otp_src_R12B-1.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R12B-1.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R12B-1.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch -Patch4: otp-glibc25.patch Patch5: otp-run_erl.patch +Patch6: otp-ssl_missing_libs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -44,13 +44,13 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R11B-2 +%setup -q -n otp_src_R12B-1 %patch0 -p1 -b .links %patch1 -p1 -b .install %patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath -%patch4 -p1 -b .glibc25 -%patch5 -p1 -b .run_erl +%patch5 -p0 -b .run_erl +%patch6 -p0 -b .keyutils %build @@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Mar 26 2008 Peter Lemenkov - R12B-1.0 +- Ver. R12B-1 + * Sun Dec 31 2006 Gerard Milmeister - R11B-2.3 - remove buildroot from installed files diff --git a/otp-glibc25.patch b/otp-glibc25.patch deleted file mode 100644 index b9d849d..0000000 --- a/otp-glibc25.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c.glibc25 2006-12-30 23:57:04.000000000 +0100 -+++ otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c 2006-12-30 23:57:36.000000000 +0100 -@@ -34,7 +34,7 @@ - #endif - #include "hipe_signal.h" - --#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4) -+#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4 || __GLIBC_MINOR__ == 5) - /* See comment below for glibc 2.2. */ - #ifndef __USE_GNU - #define __USE_GNU /* to un-hide RTLD_NEXT */ diff --git a/otp-run_erl.patch b/otp-run_erl.patch index 7629a75..dc2b262 100644 --- a/otp-run_erl.patch +++ b/otp-run_erl.patch @@ -1,46 +1,11 @@ ---- otp_src_R10B-10/erts/etc/unix/run_erl.c.bak 2006-05-03 15:54:19.000000000 +0200 -+++ otp_src_R10B-10/erts/etc/unix/run_erl.c 2006-05-03 15:57:36.000000000 +0200 -@@ -42,6 +42,8 @@ - #include - #include - #include -+#include -+#include - #if !defined(NO_SYSLOG) - #include - #endif -@@ -803,6 +805,7 @@ - static int open_pty_master(char **ptyslave) - { - int mfd; -+ int sfd; - char *major, *minor; - - static char majorchars[] = "pqrstuvwxyzabcdePQRSTUVWXYZABCDE"; -@@ -818,6 +821,15 @@ - /* http://www.xcf.berkeley.edu/~ali/K0D/UNIX/PTY/code/upty.h.html */ - - { -+ static char ttyname[] = " "; -+ if (0 == openpty(&mfd, &sfd, ttyname, NULL, NULL)) { -+ close(sfd); -+ *ptyslave = ttyname; -+ return mfd; -+ } -+ } -+ -+ { - /* New style devpts or devfs /dev/pty/{m,s}{0,1....} */ - - static char ptyname[] = "/dev/pty/mX"; ---- otp_src_R10B-10/erts/etc/common/Makefile.in.orig 2006-05-03 17:08:53.000000000 +0200 -+++ otp_src_R10B-10/erts/etc/common/Makefile.in 2006-05-03 17:10:18.000000000 +0200 -@@ -241,7 +241,7 @@ +--- erts/etc/common/Makefile.in.orig 2008-03-27 13:11:52.000000000 +0300 ++++ erts/etc/common/Makefile.in 2008-03-27 13:13:23.000000000 +0300 +@@ -298,7 +298,7 @@ $(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) $(BINDIR)/run_erl: $(OBJDIR)/run_erl.o -- $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o -+ $(LD) $(LDFLAGS) -lutil -o $@ $(OBJDIR)/run_erl.o +- $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o $(LIBS) ++ $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o $(LIBS) -lutil $(OBJDIR)/run_erl.o: ../unix/run_erl.c $(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c diff --git a/otp-ssl_missing_libs.patch b/otp-ssl_missing_libs.patch new file mode 100644 index 0000000..7c36647 --- /dev/null +++ b/otp-ssl_missing_libs.patch @@ -0,0 +1,11 @@ +--- lib/ssl/c_src/Makefile.in 2008-03-27 13:43:04.000000000 +0300 ++++ lib/ssl/c_src/Makefile.in 2008-03-27 14:03:27.000000000 +0300 +@@ -38,7 +38,7 @@ + CC = @CC@ + LD = @LD@ + SHELL = /bin/sh +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lkeyutils -lselinux + PLAIN_CFLAGS = @CFLAGS@ + + # ---------------------------------------------------- diff --git a/sources b/sources index c88cf68..8775a1f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -7d7cca1d2f392a8a317cb4c0bd904726 otp_src_R11B-2.tar.gz -e2c45ced77ec63b9b1dd95c8f5396f7d otp_doc_html_R11B-2.tar.gz -c81023f591c1bace836de3aa874f3c2a otp_doc_man_R11B-2.tar.gz +3dd8aee17fcbd3e5fda7313208fce6ac otp_doc_html_R12B-1.tar.gz +96da62bcfb40e5d3ec2945bb2b050024 otp_doc_man_R12B-1.tar.gz +6de3630b446e9c2150edfe01e383c917 otp_src_R12B-1.tar.gz -- cgit From ec0fd9e78ec21e0907fb56eaf363e7143e363ffb Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 27 Mar 2008 19:04:13 +0000 Subject: Ver. R12B-1 --- .cvsignore | 6 +++--- erlang.spec | 21 ++++++++++++--------- otp-glibc25.patch | 11 ----------- otp-run_erl.patch | 45 +++++---------------------------------------- otp-ssl_missing_libs.patch | 11 +++++++++++ sources | 6 +++--- 6 files changed, 34 insertions(+), 66 deletions(-) delete mode 100644 otp-glibc25.patch create mode 100644 otp-ssl_missing_libs.patch diff --git a/.cvsignore b/.cvsignore index 498df4a..eb1a5f9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_src_R11B-0.tar.gz -otp_doc_html_R11B-0.tar.gz -otp_doc_man_R11B-0.tar.gz +otp_doc_html_R12B-1.tar.gz +otp_doc_man_R12B-1.tar.gz +otp_src_R12B-1.tar.gz diff --git a/erlang.spec b/erlang.spec index 8c15b57..4b65ec7 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,20 +1,20 @@ Name: erlang -Version: R11B -Release: 2.3%{?dist} +Version: R12B +Release: 1.0%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R11B-2.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R11B-2.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R11B-2.tar.gz +Source: http://www.erlang.org/download/otp_src_R12B-1.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R12B-1.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R12B-1.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch -Patch4: otp-glibc25.patch Patch5: otp-run_erl.patch +Patch6: otp-ssl_missing_libs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -44,13 +44,13 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R11B-2 +%setup -q -n otp_src_R12B-1 %patch0 -p1 -b .links %patch1 -p1 -b .install %patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath -%patch4 -p1 -b .glibc25 -%patch5 -p1 -b .run_erl +%patch5 -p0 -b .run_erl +%patch6 -p0 -b .keyutils %build @@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Mar 26 2008 Peter Lemenkov - R12B-1.0 +- Ver. R12B-1 + * Sun Dec 31 2006 Gerard Milmeister - R11B-2.3 - remove buildroot from installed files diff --git a/otp-glibc25.patch b/otp-glibc25.patch deleted file mode 100644 index b9d849d..0000000 --- a/otp-glibc25.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c.glibc25 2006-12-30 23:57:04.000000000 +0100 -+++ otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c 2006-12-30 23:57:36.000000000 +0100 -@@ -34,7 +34,7 @@ - #endif - #include "hipe_signal.h" - --#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4) -+#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4 || __GLIBC_MINOR__ == 5) - /* See comment below for glibc 2.2. */ - #ifndef __USE_GNU - #define __USE_GNU /* to un-hide RTLD_NEXT */ diff --git a/otp-run_erl.patch b/otp-run_erl.patch index 7629a75..dc2b262 100644 --- a/otp-run_erl.patch +++ b/otp-run_erl.patch @@ -1,46 +1,11 @@ ---- otp_src_R10B-10/erts/etc/unix/run_erl.c.bak 2006-05-03 15:54:19.000000000 +0200 -+++ otp_src_R10B-10/erts/etc/unix/run_erl.c 2006-05-03 15:57:36.000000000 +0200 -@@ -42,6 +42,8 @@ - #include - #include - #include -+#include -+#include - #if !defined(NO_SYSLOG) - #include - #endif -@@ -803,6 +805,7 @@ - static int open_pty_master(char **ptyslave) - { - int mfd; -+ int sfd; - char *major, *minor; - - static char majorchars[] = "pqrstuvwxyzabcdePQRSTUVWXYZABCDE"; -@@ -818,6 +821,15 @@ - /* http://www.xcf.berkeley.edu/~ali/K0D/UNIX/PTY/code/upty.h.html */ - - { -+ static char ttyname[] = " "; -+ if (0 == openpty(&mfd, &sfd, ttyname, NULL, NULL)) { -+ close(sfd); -+ *ptyslave = ttyname; -+ return mfd; -+ } -+ } -+ -+ { - /* New style devpts or devfs /dev/pty/{m,s}{0,1....} */ - - static char ptyname[] = "/dev/pty/mX"; ---- otp_src_R10B-10/erts/etc/common/Makefile.in.orig 2006-05-03 17:08:53.000000000 +0200 -+++ otp_src_R10B-10/erts/etc/common/Makefile.in 2006-05-03 17:10:18.000000000 +0200 -@@ -241,7 +241,7 @@ +--- erts/etc/common/Makefile.in.orig 2008-03-27 13:11:52.000000000 +0300 ++++ erts/etc/common/Makefile.in 2008-03-27 13:13:23.000000000 +0300 +@@ -298,7 +298,7 @@ $(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) $(BINDIR)/run_erl: $(OBJDIR)/run_erl.o -- $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o -+ $(LD) $(LDFLAGS) -lutil -o $@ $(OBJDIR)/run_erl.o +- $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o $(LIBS) ++ $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o $(LIBS) -lutil $(OBJDIR)/run_erl.o: ../unix/run_erl.c $(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c diff --git a/otp-ssl_missing_libs.patch b/otp-ssl_missing_libs.patch new file mode 100644 index 0000000..7c36647 --- /dev/null +++ b/otp-ssl_missing_libs.patch @@ -0,0 +1,11 @@ +--- lib/ssl/c_src/Makefile.in 2008-03-27 13:43:04.000000000 +0300 ++++ lib/ssl/c_src/Makefile.in 2008-03-27 14:03:27.000000000 +0300 +@@ -38,7 +38,7 @@ + CC = @CC@ + LD = @LD@ + SHELL = /bin/sh +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lkeyutils -lselinux + PLAIN_CFLAGS = @CFLAGS@ + + # ---------------------------------------------------- diff --git a/sources b/sources index c88cf68..8775a1f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -7d7cca1d2f392a8a317cb4c0bd904726 otp_src_R11B-2.tar.gz -e2c45ced77ec63b9b1dd95c8f5396f7d otp_doc_html_R11B-2.tar.gz -c81023f591c1bace836de3aa874f3c2a otp_doc_man_R11B-2.tar.gz +3dd8aee17fcbd3e5fda7313208fce6ac otp_doc_html_R12B-1.tar.gz +96da62bcfb40e5d3ec2945bb2b050024 otp_doc_man_R12B-1.tar.gz +6de3630b446e9c2150edfe01e383c917 otp_src_R12B-1.tar.gz -- cgit From 20a5b8f23764af98057cec2e01977ada726e41be Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 27 Mar 2008 19:13:54 +0000 Subject: otp-glibc25.diff no longer needed since R12B-1 --- otp-glibc25.patch | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 otp-glibc25.patch diff --git a/otp-glibc25.patch b/otp-glibc25.patch deleted file mode 100644 index b9d849d..0000000 --- a/otp-glibc25.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c.glibc25 2006-12-30 23:57:04.000000000 +0100 -+++ otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c 2006-12-30 23:57:36.000000000 +0100 -@@ -34,7 +34,7 @@ - #endif - #include "hipe_signal.h" - --#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4) -+#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4 || __GLIBC_MINOR__ == 5) - /* See comment below for glibc 2.2. */ - #ifndef __USE_GNU - #define __USE_GNU /* to un-hide RTLD_NEXT */ -- cgit From 6294a9ee3d4adfd0d0ca960c213b80f3b9cb31e5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 27 Mar 2008 19:14:02 +0000 Subject: otp-glibc25.diff no longer needed since R12B-1 --- otp-glibc25.patch | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 otp-glibc25.patch diff --git a/otp-glibc25.patch b/otp-glibc25.patch deleted file mode 100644 index b9d849d..0000000 --- a/otp-glibc25.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c.glibc25 2006-12-30 23:57:04.000000000 +0100 -+++ otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c 2006-12-30 23:57:36.000000000 +0100 -@@ -34,7 +34,7 @@ - #endif - #include "hipe_signal.h" - --#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4) -+#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4 || __GLIBC_MINOR__ == 5) - /* See comment below for glibc 2.2. */ - #ifndef __USE_GNU - #define __USE_GNU /* to un-hide RTLD_NEXT */ -- cgit From 94a0b0778aae2d00b0dfc8e50f75f8c757ff3deb Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 17:15:14 +0000 Subject: Initialize branch F-9 for erlang --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 -- cgit From 2044bfbe9137c81b9146d00150ca789d5ac0003f Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sun, 6 Jul 2008 12:31:45 +0000 Subject: new release R12B-3 --- .cvsignore | 6 +++--- erlang.spec | 30 +++++++++++++++++++++--------- sources | 6 +++--- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/.cvsignore b/.cvsignore index 750bfae..40fd7e4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_src_R12B-1.tar.gz -otp_doc_man_R12B-1.tar.gz -otp_doc_html_R12B-1.tar.gz +otp_doc_html_R12B-3.tar.gz +otp_doc_man_R12B-3.tar.gz +otp_src_R12B-3.tar.gz diff --git a/erlang.spec b/erlang.spec index a37a4d1..a032924 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,19 +1,21 @@ +%define ver R12B +%define rel 3 + Name: erlang -Version: R12B -Release: 1.1%{?dist} +Version: %{ver} +Release: %{rel}.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R12B-1.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R12B-1.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R12B-1.tar.gz +Source: http://www.erlang.org/download/otp_src_%{ver}-%{rel}.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_%{ver}-%{rel}.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_%{ver}-%{rel}.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch -Patch4: otp-null.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -44,15 +46,22 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R12B-1 +%setup -q -n otp_src_%{ver}-%{rel} %patch0 -p1 -b .links %patch1 -p1 -b .install -%patch2 -p1 -b .rpath +#%patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath -%patch4 -p1 -b .null + # enable dynamic linking for ssl sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile +# fix for newer glibc version +sed -i 's|__GLIBC_MINOR__ <= 7|__GLIBC_MINOR__ <= 8|' erts/emulator/hipe/hipe_x86_signal.c +# use gcc -shared instead of ld +sed -i 's|@RX_LD@|gcc -shared|' lib/common_test/c_src/Makefile.in +sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in + + %build CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} @@ -110,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jul 6 2008 Gerard Milmeister - R12B-3.1 +- new release R12B-3 + * Thu Mar 27 2008 Gerard Milmeister - R12B-1.1 - new release R12B-1 diff --git a/sources b/sources index 0c7d74f..c7aff56 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -6de3630b446e9c2150edfe01e383c917 otp_src_R12B-1.tar.gz -96da62bcfb40e5d3ec2945bb2b050024 otp_doc_man_R12B-1.tar.gz -3dd8aee17fcbd3e5fda7313208fce6ac otp_doc_html_R12B-1.tar.gz +8865d406c256abbff63eaff62d2216aa otp_doc_html_R12B-3.tar.gz +13098954c9d5804bb8394fe7badb3d0d otp_doc_man_R12B-3.tar.gz +c2e7f0ad54b8fadebde2d94106608d97 otp_src_R12B-3.tar.gz -- cgit From b407dc548ff9dc526b076fe6e467fcfa3349e0e1 Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sun, 6 Jul 2008 12:32:48 +0000 Subject: *** empty log message *** --- erlang.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index a032924..bcdd3e3 100644 --- a/erlang.spec +++ b/erlang.spec @@ -14,7 +14,6 @@ Source1: http://www.erlang.org/download/otp_doc_html_%{ver}-%{rel}.tar.gz Source2: http://www.erlang.org/download/otp_doc_man_%{ver}-%{rel}.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch -Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -49,7 +48,6 @@ Documentation for Erlang. %setup -q -n otp_src_%{ver}-%{rel} %patch0 -p1 -b .links %patch1 -p1 -b .install -#%patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath # enable dynamic linking for ssl -- cgit From e7334c5e63b055639187fb4869b171056a2e8d5e Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 17 Jul 2008 20:13:32 +0000 Subject: fix license tag --- erlang.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index bcdd3e3..7cf3141 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,11 +3,11 @@ Name: erlang Version: %{ver} -Release: %{rel}.1%{?dist} +Release: %{rel}.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages -License: Erlang Public License +License: ERPL URL: http://www.erlang.org Source: http://www.erlang.org/download/otp_src_%{ver}-%{rel}.tar.gz Source1: http://www.erlang.org/download/otp_doc_html_%{ver}-%{rel}.tar.gz @@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 17 2008 Tom "spot" Callaway - R12B-3.2 +- fix license tag + * Sun Jul 6 2008 Gerard Milmeister - R12B-3.1 - new release R12B-3 -- cgit From e661326415769661733a1a0595968d4f893047a2 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 10 Aug 2008 21:01:21 +0000 Subject: Ver. R12B-3 --- .cvsignore | 6 ++--- erlang.spec | 71 +++++++++++++++++++++++++++++++++++++++++++------------ import.log | 1 + otp-rpath.patch | 36 ---------------------------- otp-run_erl.patch | 11 --------- sources | 6 ++--- 6 files changed, 63 insertions(+), 68 deletions(-) create mode 100644 import.log delete mode 100644 otp-rpath.patch delete mode 100644 otp-run_erl.patch diff --git a/.cvsignore b/.cvsignore index eb1a5f9..40fd7e4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_doc_html_R12B-1.tar.gz -otp_doc_man_R12B-1.tar.gz -otp_src_R12B-1.tar.gz +otp_doc_html_R12B-3.tar.gz +otp_doc_man_R12B-3.tar.gz +otp_src_R12B-3.tar.gz diff --git a/erlang.spec b/erlang.spec index 4b65ec7..89df4d7 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,20 +1,21 @@ +%define ver R12B +%define rel 3 + Name: erlang -Version: R12B -Release: 1.0%{?dist} +Version: %{ver} +Release: %{rel}.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages -License: Erlang Public License +License: ERPL URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R12B-1.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R12B-1.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R12B-1.tar.gz +Source: http://www.erlang.org/download/otp_src_%{ver}-%{rel}.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_%{ver}-%{rel}.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_%{ver}-%{rel}.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch -Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch -Patch5: otp-run_erl.patch -Patch6: otp-ssl_missing_libs.patch +Patch6: otp-ssl_missing_libs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -22,6 +23,7 @@ BuildRequires: openssl-devel BuildRequires: unixODBC-devel BuildRequires: tcl-devel BuildRequires: tk-devel +BuildRequires: gd-devel BuildRequires: java-1.4.2-gcj-compat-devel BuildRequires: flex BuildRequires: m4 @@ -44,17 +46,25 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R12B-1 +%setup -q -n otp_src_%{ver}-%{rel} %patch0 -p1 -b .links %patch1 -p1 -b .install -%patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath -%patch5 -p0 -b .run_erl %patch6 -p0 -b .keyutils +# enable dynamic linking for ssl +sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure +sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile +# fix for newer glibc version +sed -i 's|__GLIBC_MINOR__ <= 7|__GLIBC_MINOR__ <= 8|' erts/emulator/hipe/hipe_x86_signal.c +# use gcc -shared instead of ld +sed -i 's|@RX_LD@|gcc -shared|' lib/common_test/c_src/Makefile.in +sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in + + %build -./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} chmod -R u+w . make @@ -66,6 +76,7 @@ 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 @@ -108,8 +119,38 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Mar 26 2008 Peter Lemenkov - R12B-1.0 -- Ver. R12B-1 +* Thu Jul 17 2008 Tom "spot" Callaway - R12B-3.2 +- fix license tag + +* Sun Jul 6 2008 Gerard Milmeister - R12B-3.1 +- new release R12B-3 + +* Thu Mar 27 2008 Gerard Milmeister - R12B-1.1 +- new release R12B-1 + +* Sat Feb 23 2008 Gerard Milmeister - R12B-0.3 +- disable strict aliasing optimization + +* Mon Feb 18 2008 Fedora Release Engineering - R12B-0.2 +- Autorebuild for GCC 4.3 + +* Sat Dec 8 2007 Gerard Milmeister - R12B-0.1 +- new release R12B-0 + +* Wed Dec 05 2007 Release Engineering - R11B-6 + - Rebuild for deps + +* Sun Aug 19 2007 Gerard Milmeister - R11B-5.3 +- fix some permissions + +* Sat Aug 18 2007 Gerard Milmeister - R11B-5.2 +- enable dynamic linking for ssl + +* Sat Aug 18 2007 Gerard Milmeister - R11B-5.1 +- new release R11B-5 + +* Sat Mar 24 2007 Thomas Fitzsimmons - R11B-2.4 +- Require java-1.5.0-gcj-devel for build. * Sun Dec 31 2006 Gerard Milmeister - R11B-2.3 - remove buildroot from installed files diff --git a/import.log b/import.log new file mode 100644 index 0000000..bca9e59 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +erlang-R12B-3_2_fc9:EL-5:erlang-R12B-3.2.fc9.src.rpm:1218402033 diff --git a/otp-rpath.patch b/otp-rpath.patch deleted file mode 100644 index 9e82e62..0000000 --- a/otp-rpath.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- otp_src_R10B-8/lib/crypto/c_src/Makefile.in.rpath 2005-10-29 22:50:59.000000000 +0200 -+++ otp_src_R10B-8/lib/crypto/c_src/Makefile.in 2005-10-29 22:51:23.000000000 +0200 -@@ -79,7 +79,7 @@ - ifeq ($(HOST_OS),) - HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) - endif --LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ -+LD_R_FLAG= - ifeq ($(strip $(LD_R_FLAG)),) - LD_R_OPT = - else ---- otp_src_R10B-8/lib/crypto/priv/Makefile.rpath 2005-10-29 22:52:01.000000000 +0200 -+++ otp_src_R10B-8/lib/crypto/priv/Makefile 2005-10-29 22:52:32.000000000 +0200 -@@ -60,7 +60,7 @@ - # ---------------------------------------------------- - - $(SO_DRIVER): $(OBJS) -- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ -+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ - -o $@ $^ -lcrypto - - $(DLL_DRIVER): $(OBJS) ---- otp_src_R10B-8/lib/ssl/c_src/Makefile.in.rpath 2005-10-29 22:53:15.000000000 +0200 -+++ otp_src_R10B-8/lib/ssl/c_src/Makefile.in 2005-10-29 22:53:50.000000000 +0200 -@@ -104,9 +104,9 @@ - CC_R_FLAG = - else - ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, --CC_R_FLAG = -Wl,-rpath, -+CC_R_FLAG = - else # Default: -Wl,-R --CC_R_FLAG = -Wl,-R -+CC_R_FLAG = - endif - endif - diff --git a/otp-run_erl.patch b/otp-run_erl.patch deleted file mode 100644 index dc2b262..0000000 --- a/otp-run_erl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- erts/etc/common/Makefile.in.orig 2008-03-27 13:11:52.000000000 +0300 -+++ erts/etc/common/Makefile.in 2008-03-27 13:13:23.000000000 +0300 -@@ -298,7 +298,7 @@ - $(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) - - $(BINDIR)/run_erl: $(OBJDIR)/run_erl.o -- $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o $(LIBS) -+ $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o $(LIBS) -lutil - - $(OBJDIR)/run_erl.o: ../unix/run_erl.c - $(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c diff --git a/sources b/sources index 8775a1f..c7aff56 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -3dd8aee17fcbd3e5fda7313208fce6ac otp_doc_html_R12B-1.tar.gz -96da62bcfb40e5d3ec2945bb2b050024 otp_doc_man_R12B-1.tar.gz -6de3630b446e9c2150edfe01e383c917 otp_src_R12B-1.tar.gz +8865d406c256abbff63eaff62d2216aa otp_doc_html_R12B-3.tar.gz +13098954c9d5804bb8394fe7badb3d0d otp_doc_man_R12B-3.tar.gz +c2e7f0ad54b8fadebde2d94106608d97 otp_src_R12B-3.tar.gz -- cgit From 02ad4e305ad6bc317841cfbda7fa787ec788d618 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 10 Aug 2008 21:03:45 +0000 Subject: Ver. R12B-3 --- .cvsignore | 6 ++--- erlang.spec | 71 +++++++++++++++++++++++++++++++++++++++++++------------ import.log | 1 + otp-rpath.patch | 36 ---------------------------- otp-run_erl.patch | 11 --------- sources | 6 ++--- 6 files changed, 63 insertions(+), 68 deletions(-) create mode 100644 import.log delete mode 100644 otp-rpath.patch delete mode 100644 otp-run_erl.patch diff --git a/.cvsignore b/.cvsignore index eb1a5f9..40fd7e4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_doc_html_R12B-1.tar.gz -otp_doc_man_R12B-1.tar.gz -otp_src_R12B-1.tar.gz +otp_doc_html_R12B-3.tar.gz +otp_doc_man_R12B-3.tar.gz +otp_src_R12B-3.tar.gz diff --git a/erlang.spec b/erlang.spec index 4b65ec7..89df4d7 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,20 +1,21 @@ +%define ver R12B +%define rel 3 + Name: erlang -Version: R12B -Release: 1.0%{?dist} +Version: %{ver} +Release: %{rel}.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages -License: Erlang Public License +License: ERPL URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R12B-1.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R12B-1.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R12B-1.tar.gz +Source: http://www.erlang.org/download/otp_src_%{ver}-%{rel}.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_%{ver}-%{rel}.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_%{ver}-%{rel}.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch -Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch -Patch5: otp-run_erl.patch -Patch6: otp-ssl_missing_libs.patch +Patch6: otp-ssl_missing_libs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -22,6 +23,7 @@ BuildRequires: openssl-devel BuildRequires: unixODBC-devel BuildRequires: tcl-devel BuildRequires: tk-devel +BuildRequires: gd-devel BuildRequires: java-1.4.2-gcj-compat-devel BuildRequires: flex BuildRequires: m4 @@ -44,17 +46,25 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R12B-1 +%setup -q -n otp_src_%{ver}-%{rel} %patch0 -p1 -b .links %patch1 -p1 -b .install -%patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath -%patch5 -p0 -b .run_erl %patch6 -p0 -b .keyutils +# enable dynamic linking for ssl +sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure +sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile +# fix for newer glibc version +sed -i 's|__GLIBC_MINOR__ <= 7|__GLIBC_MINOR__ <= 8|' erts/emulator/hipe/hipe_x86_signal.c +# use gcc -shared instead of ld +sed -i 's|@RX_LD@|gcc -shared|' lib/common_test/c_src/Makefile.in +sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in + + %build -./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} chmod -R u+w . make @@ -66,6 +76,7 @@ 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 @@ -108,8 +119,38 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Mar 26 2008 Peter Lemenkov - R12B-1.0 -- Ver. R12B-1 +* Thu Jul 17 2008 Tom "spot" Callaway - R12B-3.2 +- fix license tag + +* Sun Jul 6 2008 Gerard Milmeister - R12B-3.1 +- new release R12B-3 + +* Thu Mar 27 2008 Gerard Milmeister - R12B-1.1 +- new release R12B-1 + +* Sat Feb 23 2008 Gerard Milmeister - R12B-0.3 +- disable strict aliasing optimization + +* Mon Feb 18 2008 Fedora Release Engineering - R12B-0.2 +- Autorebuild for GCC 4.3 + +* Sat Dec 8 2007 Gerard Milmeister - R12B-0.1 +- new release R12B-0 + +* Wed Dec 05 2007 Release Engineering - R11B-6 + - Rebuild for deps + +* Sun Aug 19 2007 Gerard Milmeister - R11B-5.3 +- fix some permissions + +* Sat Aug 18 2007 Gerard Milmeister - R11B-5.2 +- enable dynamic linking for ssl + +* Sat Aug 18 2007 Gerard Milmeister - R11B-5.1 +- new release R11B-5 + +* Sat Mar 24 2007 Thomas Fitzsimmons - R11B-2.4 +- Require java-1.5.0-gcj-devel for build. * Sun Dec 31 2006 Gerard Milmeister - R11B-2.3 - remove buildroot from installed files diff --git a/import.log b/import.log new file mode 100644 index 0000000..d674608 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +erlang-R12B-3_2_fc9:EL-4:erlang-R12B-3.2.fc9.src.rpm:1218402209 diff --git a/otp-rpath.patch b/otp-rpath.patch deleted file mode 100644 index 9e82e62..0000000 --- a/otp-rpath.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- otp_src_R10B-8/lib/crypto/c_src/Makefile.in.rpath 2005-10-29 22:50:59.000000000 +0200 -+++ otp_src_R10B-8/lib/crypto/c_src/Makefile.in 2005-10-29 22:51:23.000000000 +0200 -@@ -79,7 +79,7 @@ - ifeq ($(HOST_OS),) - HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) - endif --LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ -+LD_R_FLAG= - ifeq ($(strip $(LD_R_FLAG)),) - LD_R_OPT = - else ---- otp_src_R10B-8/lib/crypto/priv/Makefile.rpath 2005-10-29 22:52:01.000000000 +0200 -+++ otp_src_R10B-8/lib/crypto/priv/Makefile 2005-10-29 22:52:32.000000000 +0200 -@@ -60,7 +60,7 @@ - # ---------------------------------------------------- - - $(SO_DRIVER): $(OBJS) -- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ -+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ - -o $@ $^ -lcrypto - - $(DLL_DRIVER): $(OBJS) ---- otp_src_R10B-8/lib/ssl/c_src/Makefile.in.rpath 2005-10-29 22:53:15.000000000 +0200 -+++ otp_src_R10B-8/lib/ssl/c_src/Makefile.in 2005-10-29 22:53:50.000000000 +0200 -@@ -104,9 +104,9 @@ - CC_R_FLAG = - else - ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, --CC_R_FLAG = -Wl,-rpath, -+CC_R_FLAG = - else # Default: -Wl,-R --CC_R_FLAG = -Wl,-R -+CC_R_FLAG = - endif - endif - diff --git a/otp-run_erl.patch b/otp-run_erl.patch deleted file mode 100644 index dc2b262..0000000 --- a/otp-run_erl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- erts/etc/common/Makefile.in.orig 2008-03-27 13:11:52.000000000 +0300 -+++ erts/etc/common/Makefile.in 2008-03-27 13:13:23.000000000 +0300 -@@ -298,7 +298,7 @@ - $(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) - - $(BINDIR)/run_erl: $(OBJDIR)/run_erl.o -- $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o $(LIBS) -+ $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o $(LIBS) -lutil - - $(OBJDIR)/run_erl.o: ../unix/run_erl.c - $(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c diff --git a/sources b/sources index 8775a1f..c7aff56 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -3dd8aee17fcbd3e5fda7313208fce6ac otp_doc_html_R12B-1.tar.gz -96da62bcfb40e5d3ec2945bb2b050024 otp_doc_man_R12B-1.tar.gz -6de3630b446e9c2150edfe01e383c917 otp_src_R12B-1.tar.gz +8865d406c256abbff63eaff62d2216aa otp_doc_html_R12B-3.tar.gz +13098954c9d5804bb8394fe7badb3d0d otp_doc_man_R12B-3.tar.gz +c2e7f0ad54b8fadebde2d94106608d97 otp_src_R12B-3.tar.gz -- cgit From 659ba0794494c8bacc9d6eb3dfa00badda9c9e48 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 11 Aug 2008 14:27:48 +0000 Subject: Force dynamic linking of crypto libs (BZ# 458646) --- erlang.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 89df4d7..919d51f 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.2%{?dist} +Release: %{rel}.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -64,7 +64,7 @@ sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in %build -CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="-fno-strict-aliasing" ./configure --enable-dynamic-ssl-lib --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} chmod -R u+w . make @@ -102,7 +102,7 @@ sed -i "s|$RPM_BUILD_ROOT||" erts*/bin/{erl,start} releases/RELEASES bin/{erl,st rm -rf $RPM_BUILD_ROOT -%files +%files %defattr(-,root,root) %doc AUTHORS EPLICENCE README %{_bindir}/* @@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 11 2008 Peter Lemenkov - R12B-3.3 +- Force dynamic linking of crypto libs + * Thu Jul 17 2008 Tom "spot" Callaway - R12B-3.2 - fix license tag -- cgit From 9e7e74854a09aebefa736bf4e4d1e656d90499a3 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 11 Aug 2008 14:27:48 +0000 Subject: Force dynamic linking of crypto libs (BZ# 458646) --- erlang.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 89df4d7..919d51f 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.2%{?dist} +Release: %{rel}.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -64,7 +64,7 @@ sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in %build -CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="-fno-strict-aliasing" ./configure --enable-dynamic-ssl-lib --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} chmod -R u+w . make @@ -102,7 +102,7 @@ sed -i "s|$RPM_BUILD_ROOT||" erts*/bin/{erl,start} releases/RELEASES bin/{erl,st rm -rf $RPM_BUILD_ROOT -%files +%files %defattr(-,root,root) %doc AUTHORS EPLICENCE README %{_bindir}/* @@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 11 2008 Peter Lemenkov - R12B-3.3 +- Force dynamic linking of crypto libs + * Thu Jul 17 2008 Tom "spot" Callaway - R12B-3.2 - fix license tag -- cgit From 985b97c64a243702e1fcb59b53dafeb2460e52f0 Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Fri, 5 Sep 2008 20:06:12 +0000 Subject: fixed sslrpath patch --- erlang.spec | 5 ++++- otp-sslrpath.patch | 9 +++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/erlang.spec b/erlang.spec index 7cf3141..fc9e560 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.2%{?dist} +Release: %{rel}.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 5 2008 Gerard Milmeister - R12B-3.3%{?dist} +- fixed sslrpath patch + * Thu Jul 17 2008 Tom "spot" Callaway - R12B-3.2 - fix license tag diff --git a/otp-sslrpath.patch b/otp-sslrpath.patch index 83ba120..751ae2a 100644 --- a/otp-sslrpath.patch +++ b/otp-sslrpath.patch @@ -1,7 +1,8 @@ ---- otp_src_R10B-9/lib/ssl/c_src/Makefile.in.sslrpath 2005-12-29 00:49:17.000000000 +0100 -+++ otp_src_R10B-9/lib/ssl/c_src/Makefile.in 2005-12-29 00:50:15.000000000 +0100 -@@ -95,7 +95,7 @@ - endif +diff -up otp_src_R12B-3/lib/ssl/c_src/Makefile.in.sslrpath otp_src_R12B-3/lib/ssl/c_src/Makefile.in +--- otp_src_R12B-3/lib/ssl/c_src/Makefile.in.sslrpath 2008-09-05 22:01:58.000000000 +0200 ++++ otp_src_R12B-3/lib/ssl/c_src/Makefile.in 2008-09-05 22:02:34.000000000 +0200 +@@ -102,7 +102,7 @@ else + SSL_MAKEFILE = endif -CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ -- cgit From 9ca20232bd8dd81d267f011c678b9a44455ece95 Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sat, 25 Oct 2008 21:28:09 +0000 Subject: new release R12B-4 --- .cvsignore | 6 +++--- erlang.spec | 16 +++++++++------- otp-rpath.patch | 25 ++++++++++++++----------- sources | 6 +++--- 4 files changed, 29 insertions(+), 24 deletions(-) diff --git a/.cvsignore b/.cvsignore index 750bfae..4c8a7ee 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_src_R12B-1.tar.gz -otp_doc_man_R12B-1.tar.gz -otp_doc_html_R12B-1.tar.gz +otp_src_R12B-4.tar.gz +otp_doc_html_R12B-4.tar.gz +otp_doc_man_R12B-4.tar.gz diff --git a/erlang.spec b/erlang.spec index a37a4d1..b17845b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,19 +1,18 @@ Name: erlang Version: R12B -Release: 1.1%{?dist} +Release: 4.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R12B-1.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R12B-1.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R12B-1.tar.gz +Source: http://www.erlang.org/download/otp_src_R12B-4.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R12B-4.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R12B-4.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch -Patch4: otp-null.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -44,12 +43,12 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R12B-1 +%setup -q -n otp_src_R12B-4 %patch0 -p1 -b .links %patch1 -p1 -b .install %patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath -%patch4 -p1 -b .null + # enable dynamic linking for ssl sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile @@ -110,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Oct 25 2008 Gerard Milmeister - R12B-4.1 +- new release R12B-4 + * Thu Mar 27 2008 Gerard Milmeister - R12B-1.1 - new release R12B-1 diff --git a/otp-rpath.patch b/otp-rpath.patch index 9e82e62..95d38d2 100644 --- a/otp-rpath.patch +++ b/otp-rpath.patch @@ -1,17 +1,19 @@ ---- otp_src_R10B-8/lib/crypto/c_src/Makefile.in.rpath 2005-10-29 22:50:59.000000000 +0200 -+++ otp_src_R10B-8/lib/crypto/c_src/Makefile.in 2005-10-29 22:51:23.000000000 +0200 -@@ -79,7 +79,7 @@ - ifeq ($(HOST_OS),) +diff -up otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath otp_src_R12B-4/lib/crypto/c_src/Makefile.in +--- otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath 2008-10-25 22:20:42.000000000 +0200 ++++ otp_src_R12B-4/lib/crypto/c_src/Makefile.in 2008-10-25 22:20:59.000000000 +0200 +@@ -80,7 +80,7 @@ ifeq ($(HOST_OS),) HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) endif + DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ -LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ +LD_R_FLAG= ifeq ($(strip $(LD_R_FLAG)),) LD_R_OPT = else ---- otp_src_R10B-8/lib/crypto/priv/Makefile.rpath 2005-10-29 22:52:01.000000000 +0200 -+++ otp_src_R10B-8/lib/crypto/priv/Makefile 2005-10-29 22:52:32.000000000 +0200 -@@ -60,7 +60,7 @@ +diff -up otp_src_R12B-4/lib/crypto/priv/Makefile.rpath otp_src_R12B-4/lib/crypto/priv/Makefile +--- otp_src_R12B-4/lib/crypto/priv/Makefile.rpath 2008-10-25 22:21:11.000000000 +0200 ++++ otp_src_R12B-4/lib/crypto/priv/Makefile 2008-10-25 22:21:33.000000000 +0200 +@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o # ---------------------------------------------------- $(SO_DRIVER): $(OBJS) @@ -20,9 +22,10 @@ -o $@ $^ -lcrypto $(DLL_DRIVER): $(OBJS) ---- otp_src_R10B-8/lib/ssl/c_src/Makefile.in.rpath 2005-10-29 22:53:15.000000000 +0200 -+++ otp_src_R10B-8/lib/ssl/c_src/Makefile.in 2005-10-29 22:53:50.000000000 +0200 -@@ -104,9 +104,9 @@ +diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in +--- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath 2008-10-25 22:21:51.000000000 +0200 ++++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-25 22:22:21.000000000 +0200 +@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar CC_R_FLAG = else ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, @@ -33,4 +36,4 @@ +CC_R_FLAG = endif endif - + endif diff --git a/sources b/sources index 0c7d74f..7e171fb 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -6de3630b446e9c2150edfe01e383c917 otp_src_R12B-1.tar.gz -96da62bcfb40e5d3ec2945bb2b050024 otp_doc_man_R12B-1.tar.gz -3dd8aee17fcbd3e5fda7313208fce6ac otp_doc_html_R12B-1.tar.gz +ae81edda4a17506af7a9d73abca033b2 otp_src_R12B-4.tar.gz +f633cd418d8260af7a11c998aa88072b otp_doc_html_R12B-4.tar.gz +ef8f96d1721a2345cc87b208cde3de06 otp_doc_man_R12B-4.tar.gz -- cgit From e1055a8363bc0378eb84608a1d39661656d69868 Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sat, 25 Oct 2008 21:49:08 +0000 Subject: new release R12B-4 --- .cvsignore | 6 +++--- erlang.spec | 9 +++++++-- otp-rpath.patch | 25 ++++++++++++++----------- otp-sslrpath.patch | 9 ++++----- sources | 6 +++--- 5 files changed, 31 insertions(+), 24 deletions(-) diff --git a/.cvsignore b/.cvsignore index 40fd7e4..4c8a7ee 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_doc_html_R12B-3.tar.gz -otp_doc_man_R12B-3.tar.gz -otp_src_R12B-3.tar.gz +otp_src_R12B-4.tar.gz +otp_doc_html_R12B-4.tar.gz +otp_doc_man_R12B-4.tar.gz diff --git a/erlang.spec b/erlang.spec index fc9e560..3d655e1 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,9 +1,9 @@ %define ver R12B -%define rel 3 +%define rel 4 Name: erlang Version: %{ver} -Release: %{rel}.3%{?dist} +Release: %{rel}.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -14,6 +14,7 @@ Source1: http://www.erlang.org/download/otp_doc_html_%{ver}-%{rel}.tar.gz Source2: http://www.erlang.org/download/otp_doc_man_%{ver}-%{rel}.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch +Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -48,6 +49,7 @@ Documentation for Erlang. %setup -q -n otp_src_%{ver}-%{rel} %patch0 -p1 -b .links %patch1 -p1 -b .install +%patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath # enable dynamic linking for ssl @@ -117,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Oct 25 2008 Gerard Milmeister - R12B-4.1 +- new release R12B-4 + * Fri Sep 5 2008 Gerard Milmeister - R12B-3.3%{?dist} - fixed sslrpath patch diff --git a/otp-rpath.patch b/otp-rpath.patch index 9e82e62..95d38d2 100644 --- a/otp-rpath.patch +++ b/otp-rpath.patch @@ -1,17 +1,19 @@ ---- otp_src_R10B-8/lib/crypto/c_src/Makefile.in.rpath 2005-10-29 22:50:59.000000000 +0200 -+++ otp_src_R10B-8/lib/crypto/c_src/Makefile.in 2005-10-29 22:51:23.000000000 +0200 -@@ -79,7 +79,7 @@ - ifeq ($(HOST_OS),) +diff -up otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath otp_src_R12B-4/lib/crypto/c_src/Makefile.in +--- otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath 2008-10-25 22:20:42.000000000 +0200 ++++ otp_src_R12B-4/lib/crypto/c_src/Makefile.in 2008-10-25 22:20:59.000000000 +0200 +@@ -80,7 +80,7 @@ ifeq ($(HOST_OS),) HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) endif + DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ -LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ +LD_R_FLAG= ifeq ($(strip $(LD_R_FLAG)),) LD_R_OPT = else ---- otp_src_R10B-8/lib/crypto/priv/Makefile.rpath 2005-10-29 22:52:01.000000000 +0200 -+++ otp_src_R10B-8/lib/crypto/priv/Makefile 2005-10-29 22:52:32.000000000 +0200 -@@ -60,7 +60,7 @@ +diff -up otp_src_R12B-4/lib/crypto/priv/Makefile.rpath otp_src_R12B-4/lib/crypto/priv/Makefile +--- otp_src_R12B-4/lib/crypto/priv/Makefile.rpath 2008-10-25 22:21:11.000000000 +0200 ++++ otp_src_R12B-4/lib/crypto/priv/Makefile 2008-10-25 22:21:33.000000000 +0200 +@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o # ---------------------------------------------------- $(SO_DRIVER): $(OBJS) @@ -20,9 +22,10 @@ -o $@ $^ -lcrypto $(DLL_DRIVER): $(OBJS) ---- otp_src_R10B-8/lib/ssl/c_src/Makefile.in.rpath 2005-10-29 22:53:15.000000000 +0200 -+++ otp_src_R10B-8/lib/ssl/c_src/Makefile.in 2005-10-29 22:53:50.000000000 +0200 -@@ -104,9 +104,9 @@ +diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in +--- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath 2008-10-25 22:21:51.000000000 +0200 ++++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-25 22:22:21.000000000 +0200 +@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar CC_R_FLAG = else ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, @@ -33,4 +36,4 @@ +CC_R_FLAG = endif endif - + endif diff --git a/otp-sslrpath.patch b/otp-sslrpath.patch index 751ae2a..83ba120 100644 --- a/otp-sslrpath.patch +++ b/otp-sslrpath.patch @@ -1,8 +1,7 @@ -diff -up otp_src_R12B-3/lib/ssl/c_src/Makefile.in.sslrpath otp_src_R12B-3/lib/ssl/c_src/Makefile.in ---- otp_src_R12B-3/lib/ssl/c_src/Makefile.in.sslrpath 2008-09-05 22:01:58.000000000 +0200 -+++ otp_src_R12B-3/lib/ssl/c_src/Makefile.in 2008-09-05 22:02:34.000000000 +0200 -@@ -102,7 +102,7 @@ else - SSL_MAKEFILE = +--- otp_src_R10B-9/lib/ssl/c_src/Makefile.in.sslrpath 2005-12-29 00:49:17.000000000 +0100 ++++ otp_src_R10B-9/lib/ssl/c_src/Makefile.in 2005-12-29 00:50:15.000000000 +0100 +@@ -95,7 +95,7 @@ + endif endif -CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ diff --git a/sources b/sources index c7aff56..7e171fb 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -8865d406c256abbff63eaff62d2216aa otp_doc_html_R12B-3.tar.gz -13098954c9d5804bb8394fe7badb3d0d otp_doc_man_R12B-3.tar.gz -c2e7f0ad54b8fadebde2d94106608d97 otp_src_R12B-3.tar.gz +ae81edda4a17506af7a9d73abca033b2 otp_src_R12B-4.tar.gz +f633cd418d8260af7a11c998aa88072b otp_doc_html_R12B-4.tar.gz +ef8f96d1721a2345cc87b208cde3de06 otp_doc_man_R12B-4.tar.gz -- cgit From 7f83545a4705630b6daa054f779067c68d782879 Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sat, 25 Oct 2008 21:52:11 +0000 Subject: new release R12B-4 --- .cvsignore | 6 +++--- erlang.spec | 17 +++++++++++------ otp-null.patch | 11 +++++++++++ otp-rpath.patch | 25 ++++++++++++++----------- sources | 6 +++--- 5 files changed, 42 insertions(+), 23 deletions(-) create mode 100644 otp-null.patch diff --git a/.cvsignore b/.cvsignore index 750bfae..4c8a7ee 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_src_R12B-1.tar.gz -otp_doc_man_R12B-1.tar.gz -otp_doc_html_R12B-1.tar.gz +otp_src_R12B-4.tar.gz +otp_doc_html_R12B-4.tar.gz +otp_doc_man_R12B-4.tar.gz diff --git a/erlang.spec b/erlang.spec index 38cc2e2..f1dff09 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,14 +1,14 @@ Name: erlang Version: R12B -Release: 1.1%{?dist} +Release: 4.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R12B-1.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R12B-1.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R12B-1.tar.gz +Source: http://www.erlang.org/download/otp_src_R12B-4.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R12B-4.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R12B-4.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch @@ -20,6 +20,7 @@ BuildRequires: openssl-devel BuildRequires: unixODBC-devel BuildRequires: tcl-devel BuildRequires: tk-devel +BuildRequires: gd-devel BuildRequires: java-1.5.0-gcj-devel BuildRequires: flex BuildRequires: m4 @@ -42,17 +43,18 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R12B-1 +%setup -q -n otp_src_R12B-4 %patch0 -p1 -b .links %patch1 -p1 -b .install %patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath + # enable dynamic linking for ssl sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile %build -./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} chmod -R u+w . make @@ -107,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Oct 25 2008 Gerard Milmeister - R12B-4.1 +- new release R12B-4 + * Thu Mar 27 2008 Gerard Milmeister - R12B-1.1 - new release R12B-1 diff --git a/otp-null.patch b/otp-null.patch new file mode 100644 index 0000000..77a0a72 --- /dev/null +++ b/otp-null.patch @@ -0,0 +1,11 @@ +diff -up otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c.null otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c +--- otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c.null 2008-02-23 13:46:52.000000000 +0100 ++++ otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c 2008-02-23 13:47:15.000000000 +0100 +@@ -17,6 +17,7 @@ + * $Id: otp-null.patch,v 1.1 2008/10/25 21:52:10 gemi Exp $ + * + */ ++#include + #include "inet.h" + + #ifdef HAVE_CONFIG_H diff --git a/otp-rpath.patch b/otp-rpath.patch index 9e82e62..95d38d2 100644 --- a/otp-rpath.patch +++ b/otp-rpath.patch @@ -1,17 +1,19 @@ ---- otp_src_R10B-8/lib/crypto/c_src/Makefile.in.rpath 2005-10-29 22:50:59.000000000 +0200 -+++ otp_src_R10B-8/lib/crypto/c_src/Makefile.in 2005-10-29 22:51:23.000000000 +0200 -@@ -79,7 +79,7 @@ - ifeq ($(HOST_OS),) +diff -up otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath otp_src_R12B-4/lib/crypto/c_src/Makefile.in +--- otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath 2008-10-25 22:20:42.000000000 +0200 ++++ otp_src_R12B-4/lib/crypto/c_src/Makefile.in 2008-10-25 22:20:59.000000000 +0200 +@@ -80,7 +80,7 @@ ifeq ($(HOST_OS),) HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) endif + DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ -LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ +LD_R_FLAG= ifeq ($(strip $(LD_R_FLAG)),) LD_R_OPT = else ---- otp_src_R10B-8/lib/crypto/priv/Makefile.rpath 2005-10-29 22:52:01.000000000 +0200 -+++ otp_src_R10B-8/lib/crypto/priv/Makefile 2005-10-29 22:52:32.000000000 +0200 -@@ -60,7 +60,7 @@ +diff -up otp_src_R12B-4/lib/crypto/priv/Makefile.rpath otp_src_R12B-4/lib/crypto/priv/Makefile +--- otp_src_R12B-4/lib/crypto/priv/Makefile.rpath 2008-10-25 22:21:11.000000000 +0200 ++++ otp_src_R12B-4/lib/crypto/priv/Makefile 2008-10-25 22:21:33.000000000 +0200 +@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o # ---------------------------------------------------- $(SO_DRIVER): $(OBJS) @@ -20,9 +22,10 @@ -o $@ $^ -lcrypto $(DLL_DRIVER): $(OBJS) ---- otp_src_R10B-8/lib/ssl/c_src/Makefile.in.rpath 2005-10-29 22:53:15.000000000 +0200 -+++ otp_src_R10B-8/lib/ssl/c_src/Makefile.in 2005-10-29 22:53:50.000000000 +0200 -@@ -104,9 +104,9 @@ +diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in +--- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath 2008-10-25 22:21:51.000000000 +0200 ++++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-25 22:22:21.000000000 +0200 +@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar CC_R_FLAG = else ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, @@ -33,4 +36,4 @@ +CC_R_FLAG = endif endif - + endif diff --git a/sources b/sources index 0c7d74f..7e171fb 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -6de3630b446e9c2150edfe01e383c917 otp_src_R12B-1.tar.gz -96da62bcfb40e5d3ec2945bb2b050024 otp_doc_man_R12B-1.tar.gz -3dd8aee17fcbd3e5fda7313208fce6ac otp_doc_html_R12B-1.tar.gz +ae81edda4a17506af7a9d73abca033b2 otp_src_R12B-4.tar.gz +f633cd418d8260af7a11c998aa88072b otp_doc_html_R12B-4.tar.gz +ef8f96d1721a2345cc87b208cde3de06 otp_doc_man_R12B-4.tar.gz -- cgit From c2fb77092e86e7d45e84389c9d7c676aad7df5ec Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sat, 25 Oct 2008 22:01:51 +0000 Subject: *** empty log message *** --- erlang.spec | 2 +- otp-sslrpath.patch | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/erlang.spec b/erlang.spec index 3d655e1..eafcdf4 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.1%{?dist} +Release: %{rel}.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages diff --git a/otp-sslrpath.patch b/otp-sslrpath.patch index 83ba120..d53909a 100644 --- a/otp-sslrpath.patch +++ b/otp-sslrpath.patch @@ -1,7 +1,8 @@ ---- otp_src_R10B-9/lib/ssl/c_src/Makefile.in.sslrpath 2005-12-29 00:49:17.000000000 +0100 -+++ otp_src_R10B-9/lib/ssl/c_src/Makefile.in 2005-12-29 00:50:15.000000000 +0100 -@@ -95,7 +95,7 @@ - endif +diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in +--- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath 2008-10-26 00:00:37.000000000 +0200 ++++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-26 00:01:09.000000000 +0200 +@@ -102,7 +102,7 @@ else + SSL_MAKEFILE = endif -CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ @@ -9,3 +10,15 @@ ifeq ($(findstring @,$(CC_R_FLAG)),@) # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; # we try our best here instead... +@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar + CC_R_FLAG = + else + ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, +-CC_R_FLAG = -Wl,-rpath, ++CC_R_FLAG = + else # Default: -Wl,-R +-CC_R_FLAG = -Wl,-R ++CC_R_FLAG = + endif + endif + endif -- cgit From b3529c5bfe4162a1fd0a9aceaf0d99f92e81577b Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sat, 25 Oct 2008 23:08:02 +0000 Subject: *** empty log message *** --- erlang.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index eafcdf4..4d7ca9b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.2%{?dist} +Release: %{rel}.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -50,7 +50,7 @@ Documentation for Erlang. %patch0 -p1 -b .links %patch1 -p1 -b .install %patch2 -p1 -b .rpath -%patch3 -p1 -b .sslrpath +#%patch3 -p1 -b .sslrpath # enable dynamic linking for ssl sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure -- cgit From d8e37ed8943d1f83bf8509b9300e6f8084bd03ee Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 03:49:38 +0000 Subject: Initialize branch F-10 for erlang --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 -- cgit From d48dfeccd1129096cd9e31b3b2a3752627934fb1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 15 Feb 2009 02:39:03 +0000 Subject: fix sparc arch building --- erlang.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index b17845b..9c15f19 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,6 +1,6 @@ Name: erlang Version: R12B -Release: 4.1%{?dist} +Release: 4.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -54,7 +54,11 @@ sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile %build +%ifarch sparcv9 sparc64 +CFLAGS="-mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +%else CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +%endif chmod -R u+w . make @@ -109,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Feb 14 2009 Dennis Gilmore - R12B-4.2 +- fix sparc arches to compile + * Sat Oct 25 2008 Gerard Milmeister - R12B-4.1 - new release R12B-4 -- cgit From 89fc53ae8d757ae488e73a57c79390de4f42892b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 15 Feb 2009 02:43:00 +0000 Subject: fix sparc arches --- erlang.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 4d7ca9b..b860d95 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.3%{?dist} +Release: %{rel}.4%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -64,7 +64,11 @@ sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in %build +%ifarch sparcv9 sparc64 +CFLAGS="-mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +%else CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +%endif chmod -R u+w . make @@ -119,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Feb 14 2009 Dennis Gilmore - R12B-4.4 +- fix sparc arches to compile + * Sat Oct 25 2008 Gerard Milmeister - R12B-4.1 - new release R12B-4 -- cgit From 8a7d034391d365c2bef645d0ed35a313ad57f77b Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sun, 1 Mar 2009 15:25:40 +0000 Subject: new release R12B-5 --- .cvsignore | 6 +++--- erlang.spec | 15 +++++++++++---- sources | 6 +++--- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4c8a7ee..d16b9d5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_src_R12B-4.tar.gz -otp_doc_html_R12B-4.tar.gz -otp_doc_man_R12B-4.tar.gz +otp_src_R12B-5.tar.gz +otp_doc_html_R12B-5.tar.gz +otp_doc_man_R12B-5.tar.gz diff --git a/erlang.spec b/erlang.spec index b860d95..59a85f1 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,9 +1,9 @@ %define ver R12B -%define rel 4 +%define rel 5 Name: erlang Version: %{ver} -Release: %{rel}.4%{?dist} +Release: %{rel}.6%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -92,7 +92,7 @@ tar -C $RPM_BUILD_ROOT/%{_libdir}/erlang -zxf %{SOURCE2} # make links to binaries mkdir -p $RPM_BUILD_ROOT/%{_bindir} cd $RPM_BUILD_ROOT/%{_bindir} -for file in erl erlc +for file in erl erlc escript dialyzer do ln -sf ../%{_lib}/erlang/bin/$file . done @@ -123,7 +123,14 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sat Feb 14 2009 Dennis Gilmore - R12B-4.4 +* Sun Mar 1 2009 Gerard Milmeister - R12B-5.6 +- new release R12B-5 +- link escript and dialyzer to %{_bindir} + +* Tue Feb 24 2009 Fedora Release Engineering - R12B-5.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Feb 14 2009 Dennis Gilmore - R12B-4.5 - fix sparc arches to compile * Sat Oct 25 2008 Gerard Milmeister - R12B-4.1 diff --git a/sources b/sources index 7e171fb..6f16b51 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -ae81edda4a17506af7a9d73abca033b2 otp_src_R12B-4.tar.gz -f633cd418d8260af7a11c998aa88072b otp_doc_html_R12B-4.tar.gz -ef8f96d1721a2345cc87b208cde3de06 otp_doc_man_R12B-4.tar.gz +3751ea3fea669d2b25c67eeb883734bb otp_src_R12B-5.tar.gz +fb0c5454bbd865e881b6712295f6d41f otp_doc_html_R12B-5.tar.gz +6231cb172847040395cc34b20781aa3b otp_doc_man_R12B-5.tar.gz -- cgit From bf890f64635964fa00770a29d8c65b800d3f16ec Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Sun, 1 Mar 2009 15:25:41 +0000 Subject: new release R12B-5 --- .cvsignore | 6 +++--- erlang.spec | 37 +++++++++++++++++++++++++++---------- otp-sslrpath.patch | 21 +++++++++++++++++---- sources | 6 +++--- 4 files changed, 50 insertions(+), 20 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4c8a7ee..d16b9d5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_src_R12B-4.tar.gz -otp_doc_html_R12B-4.tar.gz -otp_doc_man_R12B-4.tar.gz +otp_src_R12B-5.tar.gz +otp_doc_html_R12B-5.tar.gz +otp_doc_man_R12B-5.tar.gz diff --git a/erlang.spec b/erlang.spec index 9c15f19..9b1e7de 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,14 +1,17 @@ +%define ver R12B +%define rel 5 + Name: erlang -Version: R12B -Release: 4.2%{?dist} +Version: %{ver} +Release: %{rel}.6%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages -License: Erlang Public License +License: ERPL URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R12B-4.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R12B-4.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R12B-4.tar.gz +Source: http://www.erlang.org/download/otp_src_%{ver}-%{rel}.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_%{ver}-%{rel}.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_%{ver}-%{rel}.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch @@ -43,15 +46,22 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R12B-4 +%setup -q -n otp_src_%{ver}-%{rel} %patch0 -p1 -b .links %patch1 -p1 -b .install %patch2 -p1 -b .rpath -%patch3 -p1 -b .sslrpath +#%patch3 -p1 -b .sslrpath # enable dynamic linking for ssl sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile +# fix for newer glibc version +sed -i 's|__GLIBC_MINOR__ <= 7|__GLIBC_MINOR__ <= 8|' erts/emulator/hipe/hipe_x86_signal.c +# use gcc -shared instead of ld +sed -i 's|@RX_LD@|gcc -shared|' lib/common_test/c_src/Makefile.in +sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in + + %build %ifarch sparcv9 sparc64 @@ -82,7 +92,7 @@ tar -C $RPM_BUILD_ROOT/%{_libdir}/erlang -zxf %{SOURCE2} # make links to binaries mkdir -p $RPM_BUILD_ROOT/%{_bindir} cd $RPM_BUILD_ROOT/%{_bindir} -for file in erl erlc +for file in erl erlc escript dialyzer do ln -sf ../%{_lib}/erlang/bin/$file . done @@ -113,7 +123,14 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sat Feb 14 2009 Dennis Gilmore - R12B-4.2 +* Sun Mar 1 2009 Gerard Milmeister - R12B-5.6 +- new release R12B-5 +- link escript and dialyzer to %{_bindir} + +* Tue Feb 24 2009 Fedora Release Engineering - R12B-5.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Feb 14 2009 Dennis Gilmore - R12B-4.5 - fix sparc arches to compile * Sat Oct 25 2008 Gerard Milmeister - R12B-4.1 diff --git a/otp-sslrpath.patch b/otp-sslrpath.patch index 83ba120..d53909a 100644 --- a/otp-sslrpath.patch +++ b/otp-sslrpath.patch @@ -1,7 +1,8 @@ ---- otp_src_R10B-9/lib/ssl/c_src/Makefile.in.sslrpath 2005-12-29 00:49:17.000000000 +0100 -+++ otp_src_R10B-9/lib/ssl/c_src/Makefile.in 2005-12-29 00:50:15.000000000 +0100 -@@ -95,7 +95,7 @@ - endif +diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in +--- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath 2008-10-26 00:00:37.000000000 +0200 ++++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-26 00:01:09.000000000 +0200 +@@ -102,7 +102,7 @@ else + SSL_MAKEFILE = endif -CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ @@ -9,3 +10,15 @@ ifeq ($(findstring @,$(CC_R_FLAG)),@) # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; # we try our best here instead... +@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar + CC_R_FLAG = + else + ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, +-CC_R_FLAG = -Wl,-rpath, ++CC_R_FLAG = + else # Default: -Wl,-R +-CC_R_FLAG = -Wl,-R ++CC_R_FLAG = + endif + endif + endif diff --git a/sources b/sources index 7e171fb..6f16b51 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -ae81edda4a17506af7a9d73abca033b2 otp_src_R12B-4.tar.gz -f633cd418d8260af7a11c998aa88072b otp_doc_html_R12B-4.tar.gz -ef8f96d1721a2345cc87b208cde3de06 otp_doc_man_R12B-4.tar.gz +3751ea3fea669d2b25c67eeb883734bb otp_src_R12B-5.tar.gz +fb0c5454bbd865e881b6712295f6d41f otp_doc_html_R12B-5.tar.gz +6231cb172847040395cc34b20781aa3b otp_doc_man_R12B-5.tar.gz -- cgit From 4bf0f6f6778fb65cf367b4fb3739d6ec21f54075 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 05:25:04 +0000 Subject: Initialize branch F-11 for erlang --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 -- cgit From a5c978626aa48d4d6a7a92fb49832cb319ba068d Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 18 Apr 2009 13:59:28 +0000 Subject: ver. R12B-5 (bugfix release) --- .cvsignore | 6 +++--- erlang.spec | 42 ++++++++++++++++++++++++++++++++++-------- import.log | 1 + otp-rpath.patch | 39 +++++++++++++++++++++++++++++++++++++++ otp-sslrpath.patch | 21 +++++++++++++++++---- sources | 6 +++--- 6 files changed, 97 insertions(+), 18 deletions(-) create mode 100644 otp-rpath.patch diff --git a/.cvsignore b/.cvsignore index 40fd7e4..34a6285 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_doc_html_R12B-3.tar.gz -otp_doc_man_R12B-3.tar.gz -otp_src_R12B-3.tar.gz +otp_doc_html_R12B-5.tar.gz +otp_doc_man_R12B-5.tar.gz +otp_src_R12B-5.tar.gz diff --git a/erlang.spec b/erlang.spec index 919d51f..f13561c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,9 +1,9 @@ %define ver R12B -%define rel 3 +%define rel 5 Name: erlang Version: %{ver} -Release: %{rel}.3%{?dist} +Release: %{rel}.6%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -14,6 +14,7 @@ Source1: http://www.erlang.org/download/otp_doc_html_%{ver}-%{rel}.tar.gz Source2: http://www.erlang.org/download/otp_doc_man_%{ver}-%{rel}.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch +Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch Patch6: otp-ssl_missing_libs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -24,13 +25,17 @@ BuildRequires: unixODBC-devel BuildRequires: tcl-devel BuildRequires: tk-devel BuildRequires: gd-devel +%if 0%{?rhel} BuildRequires: java-1.4.2-gcj-compat-devel +%else +BuildRequires: java-1.5.0-gcj-devel +%endif BuildRequires: flex BuildRequires: m4 Requires: tk -%description +%description Erlang is a general-purpose programming language and runtime environment. Erlang has built-in support for concurrency, distribution and fault tolerance. Erlang is used in several large telecommunication @@ -49,7 +54,8 @@ Documentation for Erlang. %setup -q -n otp_src_%{ver}-%{rel} %patch0 -p1 -b .links %patch1 -p1 -b .install -%patch3 -p1 -b .sslrpath +%patch2 -p1 -b .rpath +#%patch3 -p1 -b .sslrpath %patch6 -p0 -b .keyutils # enable dynamic linking for ssl @@ -64,7 +70,11 @@ sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in %build -CFLAGS="-fno-strict-aliasing" ./configure --enable-dynamic-ssl-lib --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +%ifarch sparcv9 sparc64 +CFLAGS="-mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +%else +CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +%endif chmod -R u+w . make @@ -88,7 +98,7 @@ tar -C $RPM_BUILD_ROOT/%{_libdir}/erlang -zxf %{SOURCE2} # make links to binaries mkdir -p $RPM_BUILD_ROOT/%{_bindir} cd $RPM_BUILD_ROOT/%{_bindir} -for file in erl erlc +for file in erl erlc escript dialyzer do ln -sf ../%{_lib}/erlang/bin/$file . done @@ -119,8 +129,24 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Aug 11 2008 Peter Lemenkov - R12B-3.3 -- Force dynamic linking of crypto libs +* Sun Mar 1 2009 Gerard Milmeister - R12B-5.6 +- new release R12B-5 +- link escript and dialyzer to %{_bindir} + +* Tue Feb 24 2009 Fedora Release Engineering - R12B-5.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Feb 14 2009 Dennis Gilmore - R12B-4.5 +- fix sparc arches to compile + +* Fri Jan 16 2009 Tomas Mraz - R12B-4.4 +- rebuild with new openssl + +* Sat Oct 25 2008 Gerard Milmeister - R12B-4.1 +- new release R12B-4 + +* Fri Sep 5 2008 Gerard Milmeister - R12B-3.3 +- fixed sslrpath patch * Thu Jul 17 2008 Tom "spot" Callaway - R12B-3.2 - fix license tag diff --git a/import.log b/import.log index bca9e59..c740ecb 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ erlang-R12B-3_2_fc9:EL-5:erlang-R12B-3.2.fc9.src.rpm:1218402033 +erlang-R12B-5_6_fc10:EL-5:erlang-R12B-5.6.fc10.src.rpm:1240063042 diff --git a/otp-rpath.patch b/otp-rpath.patch new file mode 100644 index 0000000..95d38d2 --- /dev/null +++ b/otp-rpath.patch @@ -0,0 +1,39 @@ +diff -up otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath otp_src_R12B-4/lib/crypto/c_src/Makefile.in +--- otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath 2008-10-25 22:20:42.000000000 +0200 ++++ otp_src_R12B-4/lib/crypto/c_src/Makefile.in 2008-10-25 22:20:59.000000000 +0200 +@@ -80,7 +80,7 @@ ifeq ($(HOST_OS),) + HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) + endif + DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ +-LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ ++LD_R_FLAG= + ifeq ($(strip $(LD_R_FLAG)),) + LD_R_OPT = + else +diff -up otp_src_R12B-4/lib/crypto/priv/Makefile.rpath otp_src_R12B-4/lib/crypto/priv/Makefile +--- otp_src_R12B-4/lib/crypto/priv/Makefile.rpath 2008-10-25 22:21:11.000000000 +0200 ++++ otp_src_R12B-4/lib/crypto/priv/Makefile 2008-10-25 22:21:33.000000000 +0200 +@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o + # ---------------------------------------------------- + + $(SO_DRIVER): $(OBJS) +- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ ++ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ + -o $@ $^ -lcrypto + + $(DLL_DRIVER): $(OBJS) +diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in +--- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath 2008-10-25 22:21:51.000000000 +0200 ++++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-25 22:22:21.000000000 +0200 +@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar + CC_R_FLAG = + else + ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, +-CC_R_FLAG = -Wl,-rpath, ++CC_R_FLAG = + else # Default: -Wl,-R +-CC_R_FLAG = -Wl,-R ++CC_R_FLAG = + endif + endif + endif diff --git a/otp-sslrpath.patch b/otp-sslrpath.patch index 83ba120..d53909a 100644 --- a/otp-sslrpath.patch +++ b/otp-sslrpath.patch @@ -1,7 +1,8 @@ ---- otp_src_R10B-9/lib/ssl/c_src/Makefile.in.sslrpath 2005-12-29 00:49:17.000000000 +0100 -+++ otp_src_R10B-9/lib/ssl/c_src/Makefile.in 2005-12-29 00:50:15.000000000 +0100 -@@ -95,7 +95,7 @@ - endif +diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in +--- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath 2008-10-26 00:00:37.000000000 +0200 ++++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-26 00:01:09.000000000 +0200 +@@ -102,7 +102,7 @@ else + SSL_MAKEFILE = endif -CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ @@ -9,3 +10,15 @@ ifeq ($(findstring @,$(CC_R_FLAG)),@) # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; # we try our best here instead... +@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar + CC_R_FLAG = + else + ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, +-CC_R_FLAG = -Wl,-rpath, ++CC_R_FLAG = + else # Default: -Wl,-R +-CC_R_FLAG = -Wl,-R ++CC_R_FLAG = + endif + endif + endif diff --git a/sources b/sources index c7aff56..0b15f23 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -8865d406c256abbff63eaff62d2216aa otp_doc_html_R12B-3.tar.gz -13098954c9d5804bb8394fe7badb3d0d otp_doc_man_R12B-3.tar.gz -c2e7f0ad54b8fadebde2d94106608d97 otp_src_R12B-3.tar.gz +fb0c5454bbd865e881b6712295f6d41f otp_doc_html_R12B-5.tar.gz +6231cb172847040395cc34b20781aa3b otp_doc_man_R12B-5.tar.gz +3751ea3fea669d2b25c67eeb883734bb otp_src_R12B-5.tar.gz -- cgit From 9d47c2f5d432879cb90e9ea0554afd6da4c419ce Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Tue, 21 Apr 2009 17:55:03 +0000 Subject: *** empty log message *** --- erlang.spec | 10 +++++++--- otp-rpath.patch | 29 +++++++++++++++++++---------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/erlang.spec b/erlang.spec index 4e5471f..4e37e51 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.6%{?dist} +Release: %{rel}.7%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -65,9 +65,9 @@ sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in %build %ifarch sparcv9 sparc64 -CFLAGS="-mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} %else -CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} %endif chmod -R u+w . make @@ -123,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 21 2009 Debarshi Ray R12B-5.7 +- Updated rpath patch. +- Fixed configure to respect $RPM_OPT_FLAGS. + * Sun Mar 1 2009 Gerard Milmeister - R12B-5.6 - new release R12B-5 - link escript and dialyzer to %{_bindir} diff --git a/otp-rpath.patch b/otp-rpath.patch index 95d38d2..5b1d459 100644 --- a/otp-rpath.patch +++ b/otp-rpath.patch @@ -1,6 +1,6 @@ -diff -up otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath otp_src_R12B-4/lib/crypto/c_src/Makefile.in ---- otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath 2008-10-25 22:20:42.000000000 +0200 -+++ otp_src_R12B-4/lib/crypto/c_src/Makefile.in 2008-10-25 22:20:59.000000000 +0200 +diff -urNp otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in otp_src_R12B-5/lib/crypto/c_src/Makefile.in +--- otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in 2009-04-21 18:38:46.000000000 +0530 ++++ otp_src_R12B-5/lib/crypto/c_src/Makefile.in 2009-04-21 18:51:34.000000000 +0530 @@ -80,7 +80,7 @@ ifeq ($(HOST_OS),) HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) endif @@ -10,9 +10,9 @@ diff -up otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath otp_src_R12B-4/lib/cr ifeq ($(strip $(LD_R_FLAG)),) LD_R_OPT = else -diff -up otp_src_R12B-4/lib/crypto/priv/Makefile.rpath otp_src_R12B-4/lib/crypto/priv/Makefile ---- otp_src_R12B-4/lib/crypto/priv/Makefile.rpath 2008-10-25 22:21:11.000000000 +0200 -+++ otp_src_R12B-4/lib/crypto/priv/Makefile 2008-10-25 22:21:33.000000000 +0200 +diff -urNp otp_src_R12B-5.orig/lib/crypto/priv/Makefile otp_src_R12B-5/lib/crypto/priv/Makefile +--- otp_src_R12B-5.orig/lib/crypto/priv/Makefile 2009-04-21 18:38:46.000000000 +0530 ++++ otp_src_R12B-5/lib/crypto/priv/Makefile 2009-04-21 18:52:56.000000000 +0530 @@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o # ---------------------------------------------------- @@ -22,10 +22,19 @@ diff -up otp_src_R12B-4/lib/crypto/priv/Makefile.rpath otp_src_R12B-4/lib/crypto -o $@ $^ -lcrypto $(DLL_DRIVER): $(OBJS) -diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in ---- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath 2008-10-25 22:21:51.000000000 +0200 -+++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-25 22:22:21.000000000 +0200 -@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar +diff -urNp otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in otp_src_R12B-5/lib/ssl/c_src/Makefile.in +--- otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in 2009-04-21 18:38:47.000000000 +0530 ++++ otp_src_R12B-5/lib/ssl/c_src/Makefile.in 2009-04-21 19:58:29.000000000 +0530 +@@ -104,7 +104,7 @@ else + SSL_MAKEFILE = + endif + +-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ ++CC_R_FLAG= + ifeq ($(findstring @,$(CC_R_FLAG)),@) + # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; + # we try our best here instead... +@@ -113,9 +113,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar CC_R_FLAG = else ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, -- cgit From 231d7caa88a495b1135b0d8f74bacf77f50f63c7 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 7 May 2009 10:42:17 +0000 Subject: fixed bz# 499525 --- erlang.spec | 11 ++++++++--- import.log | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index f13561c..708a1ae 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.6%{?dist} +Release: %{rel}.6%{?dist}.1 Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -70,10 +70,12 @@ sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in %build +# WARN: --enable-dynamic-ssl-lib needed for preventing strange messages about missing dependencies on EPEL +# see https://bugzilla.redhat.com/show_bug.cgi?id=458646 and https://bugzilla.redhat.com/show_bug.cgi?id=499525 %ifarch sparcv9 sparc64 -CFLAGS="-mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="-mcpu=ultrasparc -fno-strict-aliasing" ./configure --enable-dynamic-ssl-lib --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} %else -CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="-fno-strict-aliasing" ./configure --enable-dynamic-ssl-lib --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} %endif chmod -R u+w . make @@ -129,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 7 2009 Peter Lemenkov - R12B-5.6 +- added accidentally removed --enable-dynamic-ssl-lib + * Sun Mar 1 2009 Gerard Milmeister - R12B-5.6 - new release R12B-5 - link escript and dialyzer to %{_bindir} diff --git a/import.log b/import.log index c740ecb..4047428 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ erlang-R12B-3_2_fc9:EL-5:erlang-R12B-3.2.fc9.src.rpm:1218402033 erlang-R12B-5_6_fc10:EL-5:erlang-R12B-5.6.fc10.src.rpm:1240063042 +erlang-R12B-5_6_fc10_1:EL-5:erlang-R12B-5.6.fc10.1.src.rpm:1241692887 -- cgit From 3fe333e7619d2ef717430617cbcc73f03d3bfbe3 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 04:48:43 +0000 Subject: Initialize branch F-12 for erlang --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 -- cgit From 4691488691597ad18514ded8c9e0523c3d7c4556 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:50:03 +0000 Subject: Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 50462ff..ef337d1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := erlang SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) -- cgit From 17390d59055f4794edd8680445aa32b0c1d67144 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:01 +0000 Subject: Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 50462ff..bf21c95 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: erlang -# $Id$ +# $Id: Makefile,v 1.1 2005/09/06 14:34:13 gemi Exp $ NAME := erlang SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) -- cgit From 4c964589f0a587f9ade22bac08bbf128eeb7a67d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:01 +0000 Subject: Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 50462ff..bf21c95 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: erlang -# $Id$ +# $Id: Makefile,v 1.1 2005/09/06 14:34:13 gemi Exp $ NAME := erlang SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) -- cgit From 5f00defb350a2ff00f5d48e249df7f88eecf631a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:07 +0000 Subject: Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 50462ff..bf21c95 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: erlang -# $Id$ +# $Id: Makefile,v 1.1 2005/09/06 14:34:13 gemi Exp $ NAME := erlang SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) -- cgit From 17c4143b55244793443e3f468ec3e59725045b38 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:07 +0000 Subject: Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 50462ff..ef337d1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := erlang SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) -- cgit From a3de5189760bd6c5d91c942d3b035d72c0cc08bd Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:08 +0000 Subject: Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 50462ff..ef337d1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := erlang SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) -- cgit From 7d81667a62b362b757d03536129bfa0c444d7113 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:08 +0000 Subject: Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 50462ff..ef337d1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := erlang SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) -- cgit From 3f774553d4ba3b2b76638751bdce37953ebf37d1 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:08 +0000 Subject: Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 50462ff..ef337d1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := erlang SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) -- cgit From 5c75ae17e4edd23f195c31c15b26b80537f5f989 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:08 +0000 Subject: Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 50462ff..ef337d1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := erlang SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) -- cgit From e8ff6fb23453256a8c2cbc973d2097941a698bba Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:08 +0000 Subject: Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 50462ff..ef337d1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := erlang SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) -- cgit From 98fa8bb39f149046e8a53963d8b1799cb1009ad6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:09 +0000 Subject: Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 50462ff..ef337d1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := erlang SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) -- cgit From dbc24bbcea59a756a430f2c2b125eb650a4d52d0 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Wed, 9 Dec 2009 06:25:52 +0000 Subject: - rebuild with fixed GCC, fixes couchdb crash (#527370) --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 16271e3..a95ac3c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.2%{?dist} +Release: %{rel}.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Dec 09 2009 Kevin Kofler - R13B-01.3 +- rebuild with fixed GCC, fixes couchdb crash (#527370) + * Tue Aug 25 2009 Tomas Mraz - R13B-01.2 - rebuilt with new openssl -- cgit From 754cbdf6d6c1a1a26b0143b9de046f97443a80f7 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Wed, 9 Dec 2009 06:25:52 +0000 Subject: - rebuild with fixed GCC, fixes couchdb crash (#527370) --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 16271e3..a95ac3c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.2%{?dist} +Release: %{rel}.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Dec 09 2009 Kevin Kofler - R13B-01.3 +- rebuild with fixed GCC, fixes couchdb crash (#527370) + * Tue Aug 25 2009 Tomas Mraz - R13B-01.2 - rebuilt with new openssl -- cgit From 08f1b4ce89ec94c0d7308f2d8f92786e562ad4c7 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 01:17:07 +0000 Subject: Initialize branch F-13 for erlang --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 -- cgit From c1353d5cd50cd233eb92ef1e782c2400dddb465a Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 15 Mar 2010 09:45:01 +0000 Subject: Ver. R13B-04 --- .cvsignore | 6 +-- erlang.spec | 58 +++++++++++++++------------ import.log | 1 + otp-0001-Do-not-format-man-pages.patch | 32 +++++++++++++++ otp-0002-Remove-rpath.patch | 72 ++++++++++++++++++++++++++++++++++ otp-install.patch | 30 -------------- otp-null.patch | 11 ------ otp-rpath.patch | 48 ----------------------- otp-sslrpath.patch | 24 ------------ otp_src_R13B02_OTP-8199.patch | 20 ---------- sources | 6 +-- 11 files changed, 143 insertions(+), 165 deletions(-) create mode 100644 import.log create mode 100644 otp-0001-Do-not-format-man-pages.patch create mode 100644 otp-0002-Remove-rpath.patch delete mode 100644 otp-install.patch delete mode 100644 otp-null.patch delete mode 100644 otp-rpath.patch delete mode 100644 otp-sslrpath.patch delete mode 100644 otp_src_R13B02_OTP-8199.patch diff --git a/.cvsignore b/.cvsignore index 970ea5f..697a4fc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_doc_html_R13B02.tar.gz -otp_doc_man_R13B02.tar.gz -otp_src_R13B02.tar.gz +otp_doc_html_R13B04.tar.gz +otp_doc_man_R13B04.tar.gz +otp_src_R13B04.tar.gz diff --git a/erlang.spec b/erlang.spec index ee05dd6..3ad8efd 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,5 +1,5 @@ %define ver R13B -%define rel 02 +%define rel 04 Name: erlang Version: %{ver} @@ -12,28 +12,27 @@ URL: http://www.erlang.org Source: http://www.erlang.org/download/otp_src_%{ver}%{rel}.tar.gz Source1: http://www.erlang.org/download/otp_doc_html_%{ver}%{rel}.tar.gz Source2: http://www.erlang.org/download/otp_doc_man_%{ver}%{rel}.tar.gz +# TODO this patch needs rebase against current tree Patch0: otp-links.patch -Patch1: otp-install.patch -Patch2: otp-rpath.patch -# OTP-8199 In the new release of Reltool (0.5) there is a severe bug that may cause your source files to be deleted. -# http://www.erlang.org/download/patches/otp_src_R13B02_OTP-8199.readme -Patch3: http://www.erlang.org/download/patches/otp_src_R13B02_OTP-8199.patch +Patch1: otp-0001-Do-not-format-man-pages.patch +Patch2: otp-0002-Remove-rpath.patch 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: gd-devel BuildRequires: java-1.6.0-openjdk-devel BuildRequires: flex BuildRequires: m4 +BuildRequires: fop Requires: tk -%description +%description Erlang is a general-purpose programming language and runtime environment. Erlang has built-in support for concurrency, distribution and fault tolerance. Erlang is used in several large telecommunication @@ -50,29 +49,18 @@ Documentation for Erlang. %prep %setup -q -n otp_src_%{ver}%{rel} -%patch0 -p1 -b .links -%patch1 -p1 -b .install +%patch1 -p1 -b .do_not_format_manpages %patch2 -p1 -b .rpath -%patch3 -p1 -b .OTP-8199 - -# enable dynamic linking for ssl -sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure -#sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile -# fix for newer glibc version -sed -i 's|__GLIBC_MINOR__ <= 7|__GLIBC_MINOR__ <= 8|' erts/emulator/hipe/hipe_x86_signal.c -# use gcc -shared instead of ld -#sed -i 's|@RX_LD@|gcc -shared|' lib/common_test/c_src/Makefile.in -#sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in - +# remove shipped zlib sources +rm -f erts/emulator/zlib/*.[ch] %build %ifarch sparcv9 sparc64 -CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib %else -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib %endif -chmod -R u+w . make @@ -105,14 +93,20 @@ done cd $RPM_BUILD_ROOT/%{_libdir}/erlang sed -i "s|$RPM_BUILD_ROOT||" erts*/bin/{erl,start} releases/RELEASES bin/{erl,start} +# remove unneeded *.erl sources +find $RPM_BUILD_ROOT/%{_libdir}/erlang/lib -maxdepth 2 -type d -name *src -exec rm -rf {} \; + +# fixed permisson for wx library +chmod 755 $RPM_BUILD_ROOT/%{_libdir}/erlang/lib/wx-*/priv/*/wxe_driver.so + %clean rm -rf $RPM_BUILD_ROOT -%files +%files %defattr(-,root,root) -%doc AUTHORS EPLICENCE README +%doc AUTHORS EPLICENCE README.md %{_bindir}/* %{_libdir}/erlang @@ -127,6 +121,18 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Feb 13 2010 Peter Lemenkov - R13B-04.1 +- New release R13B-04 +- Since now we're using %%configure instead of ./configure +- Removed no longer needed fix for newer glibc version +- Dropped %%patch3 (applied upstream) +- Rebased patches +- Added BR fop for rebuilding of docs +- Use system-wide zlib instead of shipped one +- Dropped BR gd-devel +- Removed unneeded sources (should be fixed upstream) +- Fixed permission for wx driver (should be fixed upstream) + * Thu Oct 22 2009 Lubomir Rintel (Good Data) - R13B-02-1 - Update to R13B-02 (patched for what's released as 02-1 by upstream) diff --git a/import.log b/import.log new file mode 100644 index 0000000..eba1091 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +erlang-R13B-04_1_fc12:F-13:erlang-R13B-04.1.fc12.src.rpm:1268646179 diff --git a/otp-0001-Do-not-format-man-pages.patch b/otp-0001-Do-not-format-man-pages.patch new file mode 100644 index 0000000..61e089e --- /dev/null +++ b/otp-0001-Do-not-format-man-pages.patch @@ -0,0 +1,32 @@ +From 80fd602b5cd9f4aaa7b6bd95e174708e27601db5 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 25 Feb 2010 16:45:28 +0300 +Subject: [PATCH 1/2] Do not format man-pages + +Signed-off-by: Peter Lemenkov +--- + erts/etc/unix/Install.src | 10 ---------- + 1 files changed, 0 insertions(+), 10 deletions(-) + +diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src +index 83f9690..d26137d 100644 +--- a/erts/etc/unix/Install.src ++++ b/erts/etc/unix/Install.src +@@ -139,14 +139,4 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot . + cp -p $Name.boot start.boot + cp -p ../releases/%I_SYSTEM_VSN%/$Name.script start.script + +-# +-# Fixing the man pages +-# +- +-if [ -d $ERL_ROOT/man ] +-then +- cd $ERL_ROOT +- ./misc/format_man_pages $ERL_ROOT +-fi +- + exit 0 +-- +1.6.2.5 + diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch new file mode 100644 index 0000000..ffc6cde --- /dev/null +++ b/otp-0002-Remove-rpath.patch @@ -0,0 +1,72 @@ +From 2e10f728feb56ea96b2832999a8c34f1f19646bc Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 25 Feb 2010 16:57:43 +0300 +Subject: [PATCH 2/2] Remove rpath + +Signed-off-by: Peter Lemenkov +--- + lib/crypto/c_src/Makefile.in | 2 +- + lib/crypto/priv/Makefile | 2 +- + lib/ssl/c_src/Makefile.in | 6 +++--- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in +index 18040a3..b169930 100644 +--- a/lib/crypto/c_src/Makefile.in ++++ b/lib/crypto/c_src/Makefile.in +@@ -83,7 +83,7 @@ endif + DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ + + ifeq ($(DYNAMIC_CRYPTO_LIB),yes) +-SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@ ++SSL_DED_LD_RUNTIME_LIBRARY_PATH = + CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -lcrypto + else + SSL_DED_LD_RUNTIME_LIBRARY_PATH= +diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile +index b8acdac..2c2989a 100644 +--- a/lib/crypto/priv/Makefile ++++ b/lib/crypto/priv/Makefile +@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o + # ---------------------------------------------------- + + $(SO_DRIVER): $(OBJS) +- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ ++ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ + -o $@ $^ -lcrypto + + $(DLL_DRIVER): $(OBJS) +diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in +index 49a209f..5e6c74e 100644 +--- a/lib/ssl/c_src/Makefile.in ++++ b/lib/ssl/c_src/Makefile.in +@@ -105,7 +105,7 @@ else + SSL_MAKEFILE = + endif + +-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ ++CC_R_FLAG= + + ifeq ($(findstring @,$(CC_R_FLAG)),@) + # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; +@@ -117,7 +117,7 @@ else + ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, + CC_R_FLAG = -Wl,-rpath, + else # Default: -Wl,-R +-CC_R_FLAG = -Wl,-R ++CC_R_FLAG = + endif + endif + endif +@@ -125,7 +125,7 @@ endif + ifeq ($(strip $(CC_R_FLAG)),) + CC_R_OPT = + else +-CC_R_OPT = $(CC_R_FLAG)$(SSL_LIBDIR) ++CC_R_OPT = + endif + + SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@ +-- +1.6.2.5 + diff --git a/otp-install.patch b/otp-install.patch deleted file mode 100644 index 147199b..0000000 --- a/otp-install.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up otp_src_R13B02/erts/etc/unix/Install.src.install otp_src_R13B02/erts/etc/unix/Install.src ---- otp_src_R13B02/erts/etc/unix/Install.src.install 2009-09-18 16:07:12.000000000 +0200 -+++ otp_src_R13B02/erts/etc/unix/Install.src 2009-10-22 15:49:01.000000000 +0200 -@@ -111,7 +111,7 @@ if [ -h epmd ]; then - /bin/rm -f epmd - fi - --ln -s $TARGET_ERL_ROOT/erts-%I_VSN%/bin/epmd epmd -+ln -s ../erts-%I_VSN%/bin/epmd epmd - - cp -p $ERL_ROOT/erts-%I_VSN%/bin/run_erl . - cp -p $ERL_ROOT/erts-%I_VSN%/bin/to_erl . -@@ -160,16 +160,4 @@ if [ "X$TARGET" != "Xsunos5" -a -d $ERL_ - (ranlib $library) > /dev/null 2>&1 - done - fi -- -- --# --# Fixing the man pages --# -- --if [ -d $ERL_ROOT/man ] --then -- cd $ERL_ROOT -- ./misc/format_man_pages $ERL_ROOT --fi -- -- -+exit 0 diff --git a/otp-null.patch b/otp-null.patch deleted file mode 100644 index 7dcaec7..0000000 --- a/otp-null.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c.null otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c ---- otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c.null 2008-02-23 13:46:52.000000000 +0100 -+++ otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c 2008-02-23 13:47:15.000000000 +0100 -@@ -17,6 +17,7 @@ - * $Id$ - * - */ -+#include - #include "inet.h" - - #ifdef HAVE_CONFIG_H diff --git a/otp-rpath.patch b/otp-rpath.patch deleted file mode 100644 index 5b1d459..0000000 --- a/otp-rpath.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -urNp otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in otp_src_R12B-5/lib/crypto/c_src/Makefile.in ---- otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in 2009-04-21 18:38:46.000000000 +0530 -+++ otp_src_R12B-5/lib/crypto/c_src/Makefile.in 2009-04-21 18:51:34.000000000 +0530 -@@ -80,7 +80,7 @@ ifeq ($(HOST_OS),) - HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) - endif - DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ --LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ -+LD_R_FLAG= - ifeq ($(strip $(LD_R_FLAG)),) - LD_R_OPT = - else -diff -urNp otp_src_R12B-5.orig/lib/crypto/priv/Makefile otp_src_R12B-5/lib/crypto/priv/Makefile ---- otp_src_R12B-5.orig/lib/crypto/priv/Makefile 2009-04-21 18:38:46.000000000 +0530 -+++ otp_src_R12B-5/lib/crypto/priv/Makefile 2009-04-21 18:52:56.000000000 +0530 -@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o - # ---------------------------------------------------- - - $(SO_DRIVER): $(OBJS) -- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ -+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ - -o $@ $^ -lcrypto - - $(DLL_DRIVER): $(OBJS) -diff -urNp otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in otp_src_R12B-5/lib/ssl/c_src/Makefile.in ---- otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in 2009-04-21 18:38:47.000000000 +0530 -+++ otp_src_R12B-5/lib/ssl/c_src/Makefile.in 2009-04-21 19:58:29.000000000 +0530 -@@ -104,7 +104,7 @@ else - SSL_MAKEFILE = - endif - --CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ -+CC_R_FLAG= - ifeq ($(findstring @,$(CC_R_FLAG)),@) - # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; - # we try our best here instead... -@@ -113,9 +113,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar - CC_R_FLAG = - else - ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, --CC_R_FLAG = -Wl,-rpath, -+CC_R_FLAG = - else # Default: -Wl,-R --CC_R_FLAG = -Wl,-R -+CC_R_FLAG = - endif - endif - endif diff --git a/otp-sslrpath.patch b/otp-sslrpath.patch deleted file mode 100644 index d53909a..0000000 --- a/otp-sslrpath.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in ---- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath 2008-10-26 00:00:37.000000000 +0200 -+++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-26 00:01:09.000000000 +0200 -@@ -102,7 +102,7 @@ else - SSL_MAKEFILE = - endif - --CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ -+CC_R_FLAG= - ifeq ($(findstring @,$(CC_R_FLAG)),@) - # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; - # we try our best here instead... -@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar - CC_R_FLAG = - else - ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, --CC_R_FLAG = -Wl,-rpath, -+CC_R_FLAG = - else # Default: -Wl,-R --CC_R_FLAG = -Wl,-R -+CC_R_FLAG = - endif - endif - endif diff --git a/otp_src_R13B02_OTP-8199.patch b/otp_src_R13B02_OTP-8199.patch deleted file mode 100644 index ca653df..0000000 --- a/otp_src_R13B02_OTP-8199.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- otp_src_R13B02/lib/reltool/src/reltool_target.erl 2009-09-18 16:25:49.000000000 +0200 -+++ otp_src_R13B02_patched/lib/reltool/src/reltool_target.erl 2009-09-22 17:45:33.000000000 +0200 -@@ -1014,7 +1014,7 @@ - TargetDir2 = filename:join([TargetDir, Dir]), - cleanup_spec(Files, TargetDir2), - file:del_dir(TargetDir2); --cleanup_spec({create_dir, _OldDir, NewDir, Files}, TargetDir) -> -+cleanup_spec({create_dir, NewDir, _OldDir, Files}, TargetDir) -> - TargetDir2 = filename:join([TargetDir, NewDir]), - cleanup_spec(Files, TargetDir2), - file:del_dir(TargetDir2); -@@ -1152,7 +1152,7 @@ - "Progname=erl\r\n", - "Rootdir=", NativeRootDir, "\r\n"], - IniFile = filename:join([BinDir, "erl.ini"]), -- file:write(IniFile, IniData); -+ ok = file:write_file(IniFile, IniData); - _ -> - subst_src_scripts(start_scripts(), ErtsBinDir, BinDir, - [{"FINAL_ROOTDIR", TargetDir2}, {"EMU", "beam"}], diff --git a/sources b/sources index 58111b9..9207cc0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -78fc0c139a0297e502a6008bd8166887 otp_doc_html_R13B02.tar.gz -975b2c8a1cc2fda017cb5cd3864e32ba otp_doc_man_R13B02.tar.gz -d70bfba6935e52a7759168a35fbcabe7 otp_src_R13B02.tar.gz +d69ce51bfabbdd0808461d86dfc95689 otp_doc_html_R13B04.tar.gz +681aaef70affc64743f4e8c0675034af otp_doc_man_R13B04.tar.gz +ca6da4921e438891967900aa6a084341 otp_src_R13B04.tar.gz -- cgit From b1e63e115209c333925488dfac75544186212c31 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 17 Mar 2010 14:56:46 +0000 Subject: Ver. R13B-04 --- .cvsignore | 6 +-- erlang.spec | 60 ++++++++++++++++------------ import.log | 1 + otp-0001-Do-not-format-man-pages.patch | 32 +++++++++++++++ otp-0002-Remove-rpath.patch | 72 ++++++++++++++++++++++++++++++++++ otp-install.patch | 29 -------------- otp-null.patch | 11 ------ otp-rpath.patch | 48 ----------------------- otp-sslrpath.patch | 24 ------------ sources | 6 +-- 10 files changed, 146 insertions(+), 143 deletions(-) create mode 100644 import.log create mode 100644 otp-0001-Do-not-format-man-pages.patch create mode 100644 otp-0002-Remove-rpath.patch delete mode 100644 otp-install.patch delete mode 100644 otp-null.patch delete mode 100644 otp-rpath.patch delete mode 100644 otp-sslrpath.patch diff --git a/.cvsignore b/.cvsignore index 5704058..697a4fc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_src_R13B01.tar.gz -otp_doc_html_R13B01.tar.gz -otp_doc_man_R13B01.tar.gz +otp_doc_html_R13B04.tar.gz +otp_doc_man_R13B04.tar.gz +otp_src_R13B04.tar.gz diff --git a/erlang.spec b/erlang.spec index a95ac3c..3ad8efd 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,9 +1,9 @@ %define ver R13B -%define rel 01 +%define rel 04 Name: erlang Version: %{ver} -Release: %{rel}.3%{?dist} +Release: %{rel}.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -12,25 +12,27 @@ URL: http://www.erlang.org Source: http://www.erlang.org/download/otp_src_%{ver}%{rel}.tar.gz Source1: http://www.erlang.org/download/otp_doc_html_%{ver}%{rel}.tar.gz Source2: http://www.erlang.org/download/otp_doc_man_%{ver}%{rel}.tar.gz +# TODO this patch needs rebase against current tree Patch0: otp-links.patch -Patch1: otp-install.patch -Patch2: otp-rpath.patch +Patch1: otp-0001-Do-not-format-man-pages.patch +Patch2: otp-0002-Remove-rpath.patch 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: gd-devel BuildRequires: java-1.6.0-openjdk-devel BuildRequires: flex BuildRequires: m4 +BuildRequires: fop Requires: tk -%description +%description Erlang is a general-purpose programming language and runtime environment. Erlang has built-in support for concurrency, distribution and fault tolerance. Erlang is used in several large telecommunication @@ -47,28 +49,18 @@ Documentation for Erlang. %prep %setup -q -n otp_src_%{ver}%{rel} -%patch0 -p1 -b .links -%patch1 -p1 -b .install +%patch1 -p1 -b .do_not_format_manpages %patch2 -p1 -b .rpath - -# enable dynamic linking for ssl -sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure -#sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile -# fix for newer glibc version -sed -i 's|__GLIBC_MINOR__ <= 7|__GLIBC_MINOR__ <= 8|' erts/emulator/hipe/hipe_x86_signal.c -# use gcc -shared instead of ld -#sed -i 's|@RX_LD@|gcc -shared|' lib/common_test/c_src/Makefile.in -#sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in - +# remove shipped zlib sources +rm -f erts/emulator/zlib/*.[ch] %build %ifarch sparcv9 sparc64 -CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib %else -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib %endif -chmod -R u+w . make @@ -101,14 +93,20 @@ done cd $RPM_BUILD_ROOT/%{_libdir}/erlang sed -i "s|$RPM_BUILD_ROOT||" erts*/bin/{erl,start} releases/RELEASES bin/{erl,start} +# remove unneeded *.erl sources +find $RPM_BUILD_ROOT/%{_libdir}/erlang/lib -maxdepth 2 -type d -name *src -exec rm -rf {} \; + +# fixed permisson for wx library +chmod 755 $RPM_BUILD_ROOT/%{_libdir}/erlang/lib/wx-*/priv/*/wxe_driver.so + %clean rm -rf $RPM_BUILD_ROOT -%files +%files %defattr(-,root,root) -%doc AUTHORS EPLICENCE README +%doc AUTHORS EPLICENCE README.md %{_bindir}/* %{_libdir}/erlang @@ -123,8 +121,20 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Dec 09 2009 Kevin Kofler - R13B-01.3 -- rebuild with fixed GCC, fixes couchdb crash (#527370) +* Sat Feb 13 2010 Peter Lemenkov - R13B-04.1 +- New release R13B-04 +- Since now we're using %%configure instead of ./configure +- Removed no longer needed fix for newer glibc version +- Dropped %%patch3 (applied upstream) +- Rebased patches +- Added BR fop for rebuilding of docs +- Use system-wide zlib instead of shipped one +- Dropped BR gd-devel +- Removed unneeded sources (should be fixed upstream) +- Fixed permission for wx driver (should be fixed upstream) + +* Thu Oct 22 2009 Lubomir Rintel (Good Data) - R13B-02-1 +- Update to R13B-02 (patched for what's released as 02-1 by upstream) * Tue Aug 25 2009 Tomas Mraz - R13B-01.2 - rebuilt with new openssl diff --git a/import.log b/import.log new file mode 100644 index 0000000..e0372c1 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +erlang-R13B-04_1_fc12:F-12:erlang-R13B-04.1.fc12.src.rpm:1268837646 diff --git a/otp-0001-Do-not-format-man-pages.patch b/otp-0001-Do-not-format-man-pages.patch new file mode 100644 index 0000000..61e089e --- /dev/null +++ b/otp-0001-Do-not-format-man-pages.patch @@ -0,0 +1,32 @@ +From 80fd602b5cd9f4aaa7b6bd95e174708e27601db5 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 25 Feb 2010 16:45:28 +0300 +Subject: [PATCH 1/2] Do not format man-pages + +Signed-off-by: Peter Lemenkov +--- + erts/etc/unix/Install.src | 10 ---------- + 1 files changed, 0 insertions(+), 10 deletions(-) + +diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src +index 83f9690..d26137d 100644 +--- a/erts/etc/unix/Install.src ++++ b/erts/etc/unix/Install.src +@@ -139,14 +139,4 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot . + cp -p $Name.boot start.boot + cp -p ../releases/%I_SYSTEM_VSN%/$Name.script start.script + +-# +-# Fixing the man pages +-# +- +-if [ -d $ERL_ROOT/man ] +-then +- cd $ERL_ROOT +- ./misc/format_man_pages $ERL_ROOT +-fi +- + exit 0 +-- +1.6.2.5 + diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch new file mode 100644 index 0000000..ffc6cde --- /dev/null +++ b/otp-0002-Remove-rpath.patch @@ -0,0 +1,72 @@ +From 2e10f728feb56ea96b2832999a8c34f1f19646bc Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 25 Feb 2010 16:57:43 +0300 +Subject: [PATCH 2/2] Remove rpath + +Signed-off-by: Peter Lemenkov +--- + lib/crypto/c_src/Makefile.in | 2 +- + lib/crypto/priv/Makefile | 2 +- + lib/ssl/c_src/Makefile.in | 6 +++--- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in +index 18040a3..b169930 100644 +--- a/lib/crypto/c_src/Makefile.in ++++ b/lib/crypto/c_src/Makefile.in +@@ -83,7 +83,7 @@ endif + DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ + + ifeq ($(DYNAMIC_CRYPTO_LIB),yes) +-SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@ ++SSL_DED_LD_RUNTIME_LIBRARY_PATH = + CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -lcrypto + else + SSL_DED_LD_RUNTIME_LIBRARY_PATH= +diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile +index b8acdac..2c2989a 100644 +--- a/lib/crypto/priv/Makefile ++++ b/lib/crypto/priv/Makefile +@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o + # ---------------------------------------------------- + + $(SO_DRIVER): $(OBJS) +- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ ++ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ + -o $@ $^ -lcrypto + + $(DLL_DRIVER): $(OBJS) +diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in +index 49a209f..5e6c74e 100644 +--- a/lib/ssl/c_src/Makefile.in ++++ b/lib/ssl/c_src/Makefile.in +@@ -105,7 +105,7 @@ else + SSL_MAKEFILE = + endif + +-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ ++CC_R_FLAG= + + ifeq ($(findstring @,$(CC_R_FLAG)),@) + # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; +@@ -117,7 +117,7 @@ else + ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, + CC_R_FLAG = -Wl,-rpath, + else # Default: -Wl,-R +-CC_R_FLAG = -Wl,-R ++CC_R_FLAG = + endif + endif + endif +@@ -125,7 +125,7 @@ endif + ifeq ($(strip $(CC_R_FLAG)),) + CC_R_OPT = + else +-CC_R_OPT = $(CC_R_FLAG)$(SSL_LIBDIR) ++CC_R_OPT = + endif + + SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@ +-- +1.6.2.5 + diff --git a/otp-install.patch b/otp-install.patch deleted file mode 100644 index 68066c7..0000000 --- a/otp-install.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- otp_src_R9C-0/erts/etc/unix/Install.src.install 2003-10-17 12:52:14.000000000 +0200 -+++ otp_src_R9C-0/erts/etc/unix/Install.src 2003-10-17 14:26:49.000000000 +0200 -@@ -84,7 +84,7 @@ - /bin/rm -f epmd - fi - --ln -s $ERL_ROOT/erts-%I_VSN%/bin/epmd epmd -+ln -s ../erts-%I_VSN%/bin/epmd epmd - - cp -p $ERL_ROOT/erts-%I_VSN%/bin/run_erl . - cp -p $ERL_ROOT/erts-%I_VSN%/bin/to_erl . -@@ -145,16 +145,4 @@ - (ranlib $library) > /dev/null 2>&1 - done - fi -- -- --# --# Fixing the man pages --# -- --if [ -d $ERL_ROOT/man ] --then -- cd $ERL_ROOT -- ./misc/format_man_pages $ERL_ROOT --fi -- -- -+exit 0 diff --git a/otp-null.patch b/otp-null.patch deleted file mode 100644 index 7dcaec7..0000000 --- a/otp-null.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c.null otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c ---- otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c.null 2008-02-23 13:46:52.000000000 +0100 -+++ otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c 2008-02-23 13:47:15.000000000 +0100 -@@ -17,6 +17,7 @@ - * $Id$ - * - */ -+#include - #include "inet.h" - - #ifdef HAVE_CONFIG_H diff --git a/otp-rpath.patch b/otp-rpath.patch deleted file mode 100644 index 5b1d459..0000000 --- a/otp-rpath.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -urNp otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in otp_src_R12B-5/lib/crypto/c_src/Makefile.in ---- otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in 2009-04-21 18:38:46.000000000 +0530 -+++ otp_src_R12B-5/lib/crypto/c_src/Makefile.in 2009-04-21 18:51:34.000000000 +0530 -@@ -80,7 +80,7 @@ ifeq ($(HOST_OS),) - HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) - endif - DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ --LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ -+LD_R_FLAG= - ifeq ($(strip $(LD_R_FLAG)),) - LD_R_OPT = - else -diff -urNp otp_src_R12B-5.orig/lib/crypto/priv/Makefile otp_src_R12B-5/lib/crypto/priv/Makefile ---- otp_src_R12B-5.orig/lib/crypto/priv/Makefile 2009-04-21 18:38:46.000000000 +0530 -+++ otp_src_R12B-5/lib/crypto/priv/Makefile 2009-04-21 18:52:56.000000000 +0530 -@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o - # ---------------------------------------------------- - - $(SO_DRIVER): $(OBJS) -- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ -+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ - -o $@ $^ -lcrypto - - $(DLL_DRIVER): $(OBJS) -diff -urNp otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in otp_src_R12B-5/lib/ssl/c_src/Makefile.in ---- otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in 2009-04-21 18:38:47.000000000 +0530 -+++ otp_src_R12B-5/lib/ssl/c_src/Makefile.in 2009-04-21 19:58:29.000000000 +0530 -@@ -104,7 +104,7 @@ else - SSL_MAKEFILE = - endif - --CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ -+CC_R_FLAG= - ifeq ($(findstring @,$(CC_R_FLAG)),@) - # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; - # we try our best here instead... -@@ -113,9 +113,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar - CC_R_FLAG = - else - ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, --CC_R_FLAG = -Wl,-rpath, -+CC_R_FLAG = - else # Default: -Wl,-R --CC_R_FLAG = -Wl,-R -+CC_R_FLAG = - endif - endif - endif diff --git a/otp-sslrpath.patch b/otp-sslrpath.patch deleted file mode 100644 index d53909a..0000000 --- a/otp-sslrpath.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in ---- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath 2008-10-26 00:00:37.000000000 +0200 -+++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-26 00:01:09.000000000 +0200 -@@ -102,7 +102,7 @@ else - SSL_MAKEFILE = - endif - --CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ -+CC_R_FLAG= - ifeq ($(findstring @,$(CC_R_FLAG)),@) - # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; - # we try our best here instead... -@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar - CC_R_FLAG = - else - ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, --CC_R_FLAG = -Wl,-rpath, -+CC_R_FLAG = - else # Default: -Wl,-R --CC_R_FLAG = -Wl,-R -+CC_R_FLAG = - endif - endif - endif diff --git a/sources b/sources index 4958992..9207cc0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -b3db581de6c13e1ec93d74e54a7b4231 otp_src_R13B01.tar.gz -42cb55bbfa5dc071fd56034615072f7a otp_doc_html_R13B01.tar.gz -fa8f96159bd9a88aa2fb9e4d79d7affe otp_doc_man_R13B01.tar.gz +d69ce51bfabbdd0808461d86dfc95689 otp_doc_html_R13B04.tar.gz +681aaef70affc64743f4e8c0675034af otp_doc_man_R13B04.tar.gz +ca6da4921e438891967900aa6a084341 otp_src_R13B04.tar.gz -- cgit From 4de816847263280723a9099b72762a37663bb480 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 17 Mar 2010 14:56:46 +0000 Subject: Ver. R13B-04 --- .cvsignore | 6 +-- erlang.spec | 60 ++++++++++++++++------------ import.log | 1 + otp-0001-Do-not-format-man-pages.patch | 32 +++++++++++++++ otp-0002-Remove-rpath.patch | 72 ++++++++++++++++++++++++++++++++++ otp-install.patch | 29 -------------- otp-null.patch | 11 ------ otp-rpath.patch | 48 ----------------------- otp-sslrpath.patch | 24 ------------ sources | 6 +-- 10 files changed, 146 insertions(+), 143 deletions(-) create mode 100644 import.log create mode 100644 otp-0001-Do-not-format-man-pages.patch create mode 100644 otp-0002-Remove-rpath.patch delete mode 100644 otp-install.patch delete mode 100644 otp-null.patch delete mode 100644 otp-rpath.patch delete mode 100644 otp-sslrpath.patch diff --git a/.cvsignore b/.cvsignore index 5704058..697a4fc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_src_R13B01.tar.gz -otp_doc_html_R13B01.tar.gz -otp_doc_man_R13B01.tar.gz +otp_doc_html_R13B04.tar.gz +otp_doc_man_R13B04.tar.gz +otp_src_R13B04.tar.gz diff --git a/erlang.spec b/erlang.spec index a95ac3c..3ad8efd 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,9 +1,9 @@ %define ver R13B -%define rel 01 +%define rel 04 Name: erlang Version: %{ver} -Release: %{rel}.3%{?dist} +Release: %{rel}.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -12,25 +12,27 @@ URL: http://www.erlang.org Source: http://www.erlang.org/download/otp_src_%{ver}%{rel}.tar.gz Source1: http://www.erlang.org/download/otp_doc_html_%{ver}%{rel}.tar.gz Source2: http://www.erlang.org/download/otp_doc_man_%{ver}%{rel}.tar.gz +# TODO this patch needs rebase against current tree Patch0: otp-links.patch -Patch1: otp-install.patch -Patch2: otp-rpath.patch +Patch1: otp-0001-Do-not-format-man-pages.patch +Patch2: otp-0002-Remove-rpath.patch 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: gd-devel BuildRequires: java-1.6.0-openjdk-devel BuildRequires: flex BuildRequires: m4 +BuildRequires: fop Requires: tk -%description +%description Erlang is a general-purpose programming language and runtime environment. Erlang has built-in support for concurrency, distribution and fault tolerance. Erlang is used in several large telecommunication @@ -47,28 +49,18 @@ Documentation for Erlang. %prep %setup -q -n otp_src_%{ver}%{rel} -%patch0 -p1 -b .links -%patch1 -p1 -b .install +%patch1 -p1 -b .do_not_format_manpages %patch2 -p1 -b .rpath - -# enable dynamic linking for ssl -sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure -#sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile -# fix for newer glibc version -sed -i 's|__GLIBC_MINOR__ <= 7|__GLIBC_MINOR__ <= 8|' erts/emulator/hipe/hipe_x86_signal.c -# use gcc -shared instead of ld -#sed -i 's|@RX_LD@|gcc -shared|' lib/common_test/c_src/Makefile.in -#sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in - +# remove shipped zlib sources +rm -f erts/emulator/zlib/*.[ch] %build %ifarch sparcv9 sparc64 -CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib %else -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib %endif -chmod -R u+w . make @@ -101,14 +93,20 @@ done cd $RPM_BUILD_ROOT/%{_libdir}/erlang sed -i "s|$RPM_BUILD_ROOT||" erts*/bin/{erl,start} releases/RELEASES bin/{erl,start} +# remove unneeded *.erl sources +find $RPM_BUILD_ROOT/%{_libdir}/erlang/lib -maxdepth 2 -type d -name *src -exec rm -rf {} \; + +# fixed permisson for wx library +chmod 755 $RPM_BUILD_ROOT/%{_libdir}/erlang/lib/wx-*/priv/*/wxe_driver.so + %clean rm -rf $RPM_BUILD_ROOT -%files +%files %defattr(-,root,root) -%doc AUTHORS EPLICENCE README +%doc AUTHORS EPLICENCE README.md %{_bindir}/* %{_libdir}/erlang @@ -123,8 +121,20 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Dec 09 2009 Kevin Kofler - R13B-01.3 -- rebuild with fixed GCC, fixes couchdb crash (#527370) +* Sat Feb 13 2010 Peter Lemenkov - R13B-04.1 +- New release R13B-04 +- Since now we're using %%configure instead of ./configure +- Removed no longer needed fix for newer glibc version +- Dropped %%patch3 (applied upstream) +- Rebased patches +- Added BR fop for rebuilding of docs +- Use system-wide zlib instead of shipped one +- Dropped BR gd-devel +- Removed unneeded sources (should be fixed upstream) +- Fixed permission for wx driver (should be fixed upstream) + +* Thu Oct 22 2009 Lubomir Rintel (Good Data) - R13B-02-1 +- Update to R13B-02 (patched for what's released as 02-1 by upstream) * Tue Aug 25 2009 Tomas Mraz - R13B-01.2 - rebuilt with new openssl diff --git a/import.log b/import.log new file mode 100644 index 0000000..e0372c1 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +erlang-R13B-04_1_fc12:F-12:erlang-R13B-04.1.fc12.src.rpm:1268837646 diff --git a/otp-0001-Do-not-format-man-pages.patch b/otp-0001-Do-not-format-man-pages.patch new file mode 100644 index 0000000..61e089e --- /dev/null +++ b/otp-0001-Do-not-format-man-pages.patch @@ -0,0 +1,32 @@ +From 80fd602b5cd9f4aaa7b6bd95e174708e27601db5 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 25 Feb 2010 16:45:28 +0300 +Subject: [PATCH 1/2] Do not format man-pages + +Signed-off-by: Peter Lemenkov +--- + erts/etc/unix/Install.src | 10 ---------- + 1 files changed, 0 insertions(+), 10 deletions(-) + +diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src +index 83f9690..d26137d 100644 +--- a/erts/etc/unix/Install.src ++++ b/erts/etc/unix/Install.src +@@ -139,14 +139,4 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot . + cp -p $Name.boot start.boot + cp -p ../releases/%I_SYSTEM_VSN%/$Name.script start.script + +-# +-# Fixing the man pages +-# +- +-if [ -d $ERL_ROOT/man ] +-then +- cd $ERL_ROOT +- ./misc/format_man_pages $ERL_ROOT +-fi +- + exit 0 +-- +1.6.2.5 + diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch new file mode 100644 index 0000000..ffc6cde --- /dev/null +++ b/otp-0002-Remove-rpath.patch @@ -0,0 +1,72 @@ +From 2e10f728feb56ea96b2832999a8c34f1f19646bc Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 25 Feb 2010 16:57:43 +0300 +Subject: [PATCH 2/2] Remove rpath + +Signed-off-by: Peter Lemenkov +--- + lib/crypto/c_src/Makefile.in | 2 +- + lib/crypto/priv/Makefile | 2 +- + lib/ssl/c_src/Makefile.in | 6 +++--- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in +index 18040a3..b169930 100644 +--- a/lib/crypto/c_src/Makefile.in ++++ b/lib/crypto/c_src/Makefile.in +@@ -83,7 +83,7 @@ endif + DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ + + ifeq ($(DYNAMIC_CRYPTO_LIB),yes) +-SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@ ++SSL_DED_LD_RUNTIME_LIBRARY_PATH = + CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -lcrypto + else + SSL_DED_LD_RUNTIME_LIBRARY_PATH= +diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile +index b8acdac..2c2989a 100644 +--- a/lib/crypto/priv/Makefile ++++ b/lib/crypto/priv/Makefile +@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o + # ---------------------------------------------------- + + $(SO_DRIVER): $(OBJS) +- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ ++ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ + -o $@ $^ -lcrypto + + $(DLL_DRIVER): $(OBJS) +diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in +index 49a209f..5e6c74e 100644 +--- a/lib/ssl/c_src/Makefile.in ++++ b/lib/ssl/c_src/Makefile.in +@@ -105,7 +105,7 @@ else + SSL_MAKEFILE = + endif + +-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ ++CC_R_FLAG= + + ifeq ($(findstring @,$(CC_R_FLAG)),@) + # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; +@@ -117,7 +117,7 @@ else + ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, + CC_R_FLAG = -Wl,-rpath, + else # Default: -Wl,-R +-CC_R_FLAG = -Wl,-R ++CC_R_FLAG = + endif + endif + endif +@@ -125,7 +125,7 @@ endif + ifeq ($(strip $(CC_R_FLAG)),) + CC_R_OPT = + else +-CC_R_OPT = $(CC_R_FLAG)$(SSL_LIBDIR) ++CC_R_OPT = + endif + + SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@ +-- +1.6.2.5 + diff --git a/otp-install.patch b/otp-install.patch deleted file mode 100644 index 68066c7..0000000 --- a/otp-install.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- otp_src_R9C-0/erts/etc/unix/Install.src.install 2003-10-17 12:52:14.000000000 +0200 -+++ otp_src_R9C-0/erts/etc/unix/Install.src 2003-10-17 14:26:49.000000000 +0200 -@@ -84,7 +84,7 @@ - /bin/rm -f epmd - fi - --ln -s $ERL_ROOT/erts-%I_VSN%/bin/epmd epmd -+ln -s ../erts-%I_VSN%/bin/epmd epmd - - cp -p $ERL_ROOT/erts-%I_VSN%/bin/run_erl . - cp -p $ERL_ROOT/erts-%I_VSN%/bin/to_erl . -@@ -145,16 +145,4 @@ - (ranlib $library) > /dev/null 2>&1 - done - fi -- -- --# --# Fixing the man pages --# -- --if [ -d $ERL_ROOT/man ] --then -- cd $ERL_ROOT -- ./misc/format_man_pages $ERL_ROOT --fi -- -- -+exit 0 diff --git a/otp-null.patch b/otp-null.patch deleted file mode 100644 index 7dcaec7..0000000 --- a/otp-null.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c.null otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c ---- otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c.null 2008-02-23 13:46:52.000000000 +0100 -+++ otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c 2008-02-23 13:47:15.000000000 +0100 -@@ -17,6 +17,7 @@ - * $Id$ - * - */ -+#include - #include "inet.h" - - #ifdef HAVE_CONFIG_H diff --git a/otp-rpath.patch b/otp-rpath.patch deleted file mode 100644 index 5b1d459..0000000 --- a/otp-rpath.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -urNp otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in otp_src_R12B-5/lib/crypto/c_src/Makefile.in ---- otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in 2009-04-21 18:38:46.000000000 +0530 -+++ otp_src_R12B-5/lib/crypto/c_src/Makefile.in 2009-04-21 18:51:34.000000000 +0530 -@@ -80,7 +80,7 @@ ifeq ($(HOST_OS),) - HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) - endif - DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ --LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ -+LD_R_FLAG= - ifeq ($(strip $(LD_R_FLAG)),) - LD_R_OPT = - else -diff -urNp otp_src_R12B-5.orig/lib/crypto/priv/Makefile otp_src_R12B-5/lib/crypto/priv/Makefile ---- otp_src_R12B-5.orig/lib/crypto/priv/Makefile 2009-04-21 18:38:46.000000000 +0530 -+++ otp_src_R12B-5/lib/crypto/priv/Makefile 2009-04-21 18:52:56.000000000 +0530 -@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o - # ---------------------------------------------------- - - $(SO_DRIVER): $(OBJS) -- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ -+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ - -o $@ $^ -lcrypto - - $(DLL_DRIVER): $(OBJS) -diff -urNp otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in otp_src_R12B-5/lib/ssl/c_src/Makefile.in ---- otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in 2009-04-21 18:38:47.000000000 +0530 -+++ otp_src_R12B-5/lib/ssl/c_src/Makefile.in 2009-04-21 19:58:29.000000000 +0530 -@@ -104,7 +104,7 @@ else - SSL_MAKEFILE = - endif - --CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ -+CC_R_FLAG= - ifeq ($(findstring @,$(CC_R_FLAG)),@) - # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; - # we try our best here instead... -@@ -113,9 +113,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar - CC_R_FLAG = - else - ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, --CC_R_FLAG = -Wl,-rpath, -+CC_R_FLAG = - else # Default: -Wl,-R --CC_R_FLAG = -Wl,-R -+CC_R_FLAG = - endif - endif - endif diff --git a/otp-sslrpath.patch b/otp-sslrpath.patch deleted file mode 100644 index d53909a..0000000 --- a/otp-sslrpath.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in ---- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath 2008-10-26 00:00:37.000000000 +0200 -+++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-26 00:01:09.000000000 +0200 -@@ -102,7 +102,7 @@ else - SSL_MAKEFILE = - endif - --CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ -+CC_R_FLAG= - ifeq ($(findstring @,$(CC_R_FLAG)),@) - # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; - # we try our best here instead... -@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar - CC_R_FLAG = - else - ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, --CC_R_FLAG = -Wl,-rpath, -+CC_R_FLAG = - else # Default: -Wl,-R --CC_R_FLAG = -Wl,-R -+CC_R_FLAG = - endif - endif - endif diff --git a/sources b/sources index 4958992..9207cc0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -b3db581de6c13e1ec93d74e54a7b4231 otp_src_R13B01.tar.gz -42cb55bbfa5dc071fd56034615072f7a otp_doc_html_R13B01.tar.gz -fa8f96159bd9a88aa2fb9e4d79d7affe otp_doc_man_R13B01.tar.gz +d69ce51bfabbdd0808461d86dfc95689 otp_doc_html_R13B04.tar.gz +681aaef70affc64743f4e8c0675034af otp_doc_man_R13B04.tar.gz +ca6da4921e438891967900aa6a084341 otp_src_R13B04.tar.gz -- cgit From 3e490cd71f1ef662005591871014c4d9798356af Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 26 Mar 2010 13:10:30 +0000 Subject: Do not remove src dirs completely - keep *.hrl --- erlang.spec | 34 ++++++++++++++++++++++++---------- import.log | 1 + 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/erlang.spec b/erlang.spec index 3ad8efd..b53835d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.1%{?dist} +Release: %{rel}.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -78,26 +78,34 @@ find $RPM_BUILD_ROOT%{_libdir}/erlang -name index.txt.old | xargs rm -f # doc mkdir -p erlang_doc tar -C erlang_doc -zxf %{SOURCE1} -tar -C $RPM_BUILD_ROOT/%{_libdir}/erlang -zxf %{SOURCE2} -gzip $RPM_BUILD_ROOT/%{_libdir}/erlang/man/man*/* +tar -C $RPM_BUILD_ROOT%{_libdir}/erlang -zxf %{SOURCE2} +gzip $RPM_BUILD_ROOT%{_libdir}/erlang/man/man*/* # make links to binaries -mkdir -p $RPM_BUILD_ROOT/%{_bindir} -cd $RPM_BUILD_ROOT/%{_bindir} +mkdir -p $RPM_BUILD_ROOT%{_bindir} +cd $RPM_BUILD_ROOT%{_bindir} for file in erl erlc escript dialyzer do ln -sf ../%{_lib}/erlang/bin/$file . done # remove buildroot from installed files -cd $RPM_BUILD_ROOT/%{_libdir}/erlang +cd $RPM_BUILD_ROOT%{_libdir}/erlang sed -i "s|$RPM_BUILD_ROOT||" erts*/bin/{erl,start} releases/RELEASES bin/{erl,start} -# remove unneeded *.erl sources -find $RPM_BUILD_ROOT/%{_libdir}/erlang/lib -maxdepth 2 -type d -name *src -exec rm -rf {} \; +# 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 "*.[yh]rl" -print -delete || true ; done +find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ -maxdepth 2 -type d -name src -empty -delete -# fixed permisson for wx library -chmod 755 $RPM_BUILD_ROOT/%{_libdir}/erlang/lib/wx-*/priv/*/wxe_driver.so +# fix permissions for asn1 library +chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/priv/lib/asn1_erl_drv.so + +# fix permissions for megaco library +chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/megaco-*/priv/lib/megaco_flex_scanner_drv.so +chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/megaco-*/priv/lib/megaco_flex_scanner_drv_mt.so + +# fix permissons for wx library +chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/wx-*/priv/*/wxe_driver.so %clean @@ -121,6 +129,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 26 2010 Peter Lemenkov - R13B-04.2 +- Do not remove all files from %%{_libdir}/erlang/lib/*/src - keep + *.[yh]rl intact +- Fix permissions for megaco *.so objects +- Fix permissions for asn1 *.so objects + * Sat Feb 13 2010 Peter Lemenkov - R13B-04.1 - New release R13B-04 - Since now we're using %%configure instead of ./configure diff --git a/import.log b/import.log index eba1091..e66036f 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ erlang-R13B-04_1_fc12:F-13:erlang-R13B-04.1.fc12.src.rpm:1268646179 +erlang-R13B-04_2_fc12:F-13:erlang-R13B-04.2.fc12.src.rpm:1269608961 -- cgit From 78bacdfca4129a0dabab4334b3dea15679ee8dfc Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 26 Mar 2010 13:15:37 +0000 Subject: Do not remove src dirs completely - keep *.hrl --- erlang.spec | 34 ++++++++++++++++++++++++---------- import.log | 1 + 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/erlang.spec b/erlang.spec index 3ad8efd..b53835d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.1%{?dist} +Release: %{rel}.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -78,26 +78,34 @@ find $RPM_BUILD_ROOT%{_libdir}/erlang -name index.txt.old | xargs rm -f # doc mkdir -p erlang_doc tar -C erlang_doc -zxf %{SOURCE1} -tar -C $RPM_BUILD_ROOT/%{_libdir}/erlang -zxf %{SOURCE2} -gzip $RPM_BUILD_ROOT/%{_libdir}/erlang/man/man*/* +tar -C $RPM_BUILD_ROOT%{_libdir}/erlang -zxf %{SOURCE2} +gzip $RPM_BUILD_ROOT%{_libdir}/erlang/man/man*/* # make links to binaries -mkdir -p $RPM_BUILD_ROOT/%{_bindir} -cd $RPM_BUILD_ROOT/%{_bindir} +mkdir -p $RPM_BUILD_ROOT%{_bindir} +cd $RPM_BUILD_ROOT%{_bindir} for file in erl erlc escript dialyzer do ln -sf ../%{_lib}/erlang/bin/$file . done # remove buildroot from installed files -cd $RPM_BUILD_ROOT/%{_libdir}/erlang +cd $RPM_BUILD_ROOT%{_libdir}/erlang sed -i "s|$RPM_BUILD_ROOT||" erts*/bin/{erl,start} releases/RELEASES bin/{erl,start} -# remove unneeded *.erl sources -find $RPM_BUILD_ROOT/%{_libdir}/erlang/lib -maxdepth 2 -type d -name *src -exec rm -rf {} \; +# 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 "*.[yh]rl" -print -delete || true ; done +find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ -maxdepth 2 -type d -name src -empty -delete -# fixed permisson for wx library -chmod 755 $RPM_BUILD_ROOT/%{_libdir}/erlang/lib/wx-*/priv/*/wxe_driver.so +# fix permissions for asn1 library +chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/priv/lib/asn1_erl_drv.so + +# fix permissions for megaco library +chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/megaco-*/priv/lib/megaco_flex_scanner_drv.so +chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/megaco-*/priv/lib/megaco_flex_scanner_drv_mt.so + +# fix permissons for wx library +chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/wx-*/priv/*/wxe_driver.so %clean @@ -121,6 +129,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 26 2010 Peter Lemenkov - R13B-04.2 +- Do not remove all files from %%{_libdir}/erlang/lib/*/src - keep + *.[yh]rl intact +- Fix permissions for megaco *.so objects +- Fix permissions for asn1 *.so objects + * Sat Feb 13 2010 Peter Lemenkov - R13B-04.1 - New release R13B-04 - Since now we're using %%configure instead of ./configure diff --git a/import.log b/import.log index e0372c1..9a70af5 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ erlang-R13B-04_1_fc12:F-12:erlang-R13B-04.1.fc12.src.rpm:1268837646 +erlang-R13B-04_2_fc12:F-12:erlang-R13B-04.2.fc12.src.rpm:1269609314 -- cgit From 408136c5875533acd5ca1edbf99f66183e1a0552 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 26 Mar 2010 13:15:37 +0000 Subject: Do not remove src dirs completely - keep *.hrl --- erlang.spec | 34 ++++++++++++++++++++++++---------- import.log | 1 + 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/erlang.spec b/erlang.spec index 3ad8efd..b53835d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.1%{?dist} +Release: %{rel}.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -78,26 +78,34 @@ find $RPM_BUILD_ROOT%{_libdir}/erlang -name index.txt.old | xargs rm -f # doc mkdir -p erlang_doc tar -C erlang_doc -zxf %{SOURCE1} -tar -C $RPM_BUILD_ROOT/%{_libdir}/erlang -zxf %{SOURCE2} -gzip $RPM_BUILD_ROOT/%{_libdir}/erlang/man/man*/* +tar -C $RPM_BUILD_ROOT%{_libdir}/erlang -zxf %{SOURCE2} +gzip $RPM_BUILD_ROOT%{_libdir}/erlang/man/man*/* # make links to binaries -mkdir -p $RPM_BUILD_ROOT/%{_bindir} -cd $RPM_BUILD_ROOT/%{_bindir} +mkdir -p $RPM_BUILD_ROOT%{_bindir} +cd $RPM_BUILD_ROOT%{_bindir} for file in erl erlc escript dialyzer do ln -sf ../%{_lib}/erlang/bin/$file . done # remove buildroot from installed files -cd $RPM_BUILD_ROOT/%{_libdir}/erlang +cd $RPM_BUILD_ROOT%{_libdir}/erlang sed -i "s|$RPM_BUILD_ROOT||" erts*/bin/{erl,start} releases/RELEASES bin/{erl,start} -# remove unneeded *.erl sources -find $RPM_BUILD_ROOT/%{_libdir}/erlang/lib -maxdepth 2 -type d -name *src -exec rm -rf {} \; +# 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 "*.[yh]rl" -print -delete || true ; done +find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ -maxdepth 2 -type d -name src -empty -delete -# fixed permisson for wx library -chmod 755 $RPM_BUILD_ROOT/%{_libdir}/erlang/lib/wx-*/priv/*/wxe_driver.so +# fix permissions for asn1 library +chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/priv/lib/asn1_erl_drv.so + +# fix permissions for megaco library +chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/megaco-*/priv/lib/megaco_flex_scanner_drv.so +chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/megaco-*/priv/lib/megaco_flex_scanner_drv_mt.so + +# fix permissons for wx library +chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/wx-*/priv/*/wxe_driver.so %clean @@ -121,6 +129,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 26 2010 Peter Lemenkov - R13B-04.2 +- Do not remove all files from %%{_libdir}/erlang/lib/*/src - keep + *.[yh]rl intact +- Fix permissions for megaco *.so objects +- Fix permissions for asn1 *.so objects + * Sat Feb 13 2010 Peter Lemenkov - R13B-04.1 - New release R13B-04 - Since now we're using %%configure instead of ./configure diff --git a/import.log b/import.log index e0372c1..9a70af5 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ erlang-R13B-04_1_fc12:F-12:erlang-R13B-04.1.fc12.src.rpm:1268837646 +erlang-R13B-04_2_fc12:F-12:erlang-R13B-04.2.fc12.src.rpm:1269609314 -- cgit From 91a1190a60a91e8e4e8285b2551ca22bab2d5c76 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 14 Apr 2010 10:01:14 +0000 Subject: Added rpm macros and more cleanups --- erlang-find-provides.escript | 24 +++++++++++ erlang-find-provides.sh | 97 ++++++++++++++++++++++++++++++++++++++++++++ erlang-find-requires.escript | 19 +++++++++ erlang-find-requires.sh | 23 +++++++++++ erlang.spec | 56 +++++++++++++++++++++++-- import.log | 1 + macros.erlang | 13 ++++++ 7 files changed, 230 insertions(+), 3 deletions(-) create mode 100755 erlang-find-provides.escript create mode 100755 erlang-find-provides.sh create mode 100755 erlang-find-requires.escript create mode 100755 erlang-find-requires.sh create mode 100644 macros.erlang diff --git a/erlang-find-provides.escript b/erlang-find-provides.escript new file mode 100755 index 0000000..4433337 --- /dev/null +++ b/erlang-find-provides.escript @@ -0,0 +1,24 @@ +#!/usr/bin/escript +%% -*- erlang -*- + +main(EbinFiles) -> + lists:foreach( + fun(BeamFile) -> + try + {ok, {Module, [{exports,Exports}]}} = beam_lib:chunks(BeamFile, [exports]), + case Module of + eunit_test -> io:format ("erlang(eunit_test:nonexisting_function/0)~n"); + wx -> io:format ("erlang(demo:start/0)~n"); + _ -> ok + end, + lists:foreach( fun({ModFun,Arity})->io:format("erlang(~p:~s/~p)~n", [Module, ModFun,Arity]) end, Exports) + catch + _:_ -> + ok + end + end, + EbinFiles); + +main(_) -> + halt(1). + diff --git a/erlang-find-provides.sh b/erlang-find-provides.sh new file mode 100755 index 0000000..0592130 --- /dev/null +++ b/erlang-find-provides.sh @@ -0,0 +1,97 @@ +#!/bin/bash + +# This script reads filenames from STDIN and outputs any relevant provides +# information that needs to be included in the package. + +BUILDDIR= + +while true; do + case "$1" in + -b) BUILDDIR="$2"; shift 2;; + --) shift; break;; + *) echo "$0: option error at $1"; exit 1;; + esac +done + +filelist=`sed "s/['\"]/\\\&/g"` + +/usr/lib/rpm/rpmdeps --provides $filelist + +# Get the list of *.app files +appfiles=$(echo $filelist | tr [:blank:] '\n' | grep -o -E '.*/ebin/.*\.app$') + +for f in $appfiles; do + app=`cat $f | tr -d [:space:] | awk -F '{application,' '{print $2}'|cut -d , -f 1` + ver=`cat $f | tr -d [:space:] | grep -o -E '\{vsn,\".*[0-9]\"\}' | sed -e "s,.vsn\,\",,g;s,\".,,g"` + + # HiPE module is different from others + if [ "$app" == "hipe" ] ; + then + # Hardcoded minimal set of HiPE exported functions + echo "erlang(hipe_amd64_main:rtl_to_amd64/3)" + echo "erlang(hipe_arm_main:rtl_to_arm/3)" + echo "erlang(hipe:c/1)" + echo "erlang(hipe:compile/4)" + echo "erlang(hipe_data_pp:pp/4)" + echo "erlang(hipe_icode2rtl:translate/2)" + echo "erlang(hipe_icode_heap_test:cfg/1)" + echo "erlang(hipe_ppc_main:rtl_to_ppc/3)" + echo "erlang(hipe_rtl_arch:endianess/0)" + echo "erlang(hipe_rtl_arch:nr_of_return_regs/0)" + echo "erlang(hipe_rtl_arch:word_size/0)" + echo "erlang(hipe_rtl_cfg:init/1)" + echo "erlang(hipe_rtl_cfg:linearize/1)" + echo "erlang(hipe_rtl_cfg:pp/1)" + echo "erlang(hipe_rtl_cfg:remove_trivial_bbs/1)" + echo "erlang(hipe_rtl_cfg:remove_unreachable_code/1)" + echo "erlang(hipe_rtl_cleanup_const:cleanup/1)" + echo "erlang(hipe_rtl_lcm:rtl_lcm/2)" + echo "erlang(hipe_rtl_ssa_avail_expr:cfg/1)" + echo "erlang(hipe_rtl_ssa:check/1)" + echo "erlang(hipe_rtl_ssa_const_prop:propagate/1)" + echo "erlang(hipe_rtl_ssa:convert/1)" + echo "erlang(hipe_rtl_ssapre:rtl_ssapre/2)" + echo "erlang(hipe_rtl_ssa:remove_dead_code/1)" + echo "erlang(hipe_rtl_ssa:unconvert/1)" + echo "erlang(hipe_rtl_symbolic:expand/1)" + echo "erlang(hipe_sparc_main:rtl_to_sparc/3)" + echo "erlang(hipe_tagscheme:fixnum_val/1)" + echo "erlang(hipe_tagscheme:is_fixnum/1)" + echo "erlang(hipe_x86_main:rtl_to_x86/3)" + fi + + echo "erlang($app) = $ver" +done + +# Check for very special case - erts, by guessing by directory name +basedirs=$(echo $filelist | tr [:blank:] '\n' | grep -o -E 'erlang\/lib\/[a-zA-Z_0-9]*-[0-9.]*\/ebin' | cut -d \/ -f 3 | sort | uniq) +for bd in $basedirs; do + basename=`echo $bd | cut -d \- -f 1` + basever=`echo $bd | cut -d \- -f 2` + case $basename in + "erts") + echo "erlang($basename) = $basever" + + # BIFs from erts - this module is very specific + cat $BUILDDIR/erts/emulator/*/erl_bif_list.h 2>/dev/null |\ + grep -v am__AtomAlias |\ + grep -o -E 'am_.*\,am_.*\,.\,' |\ + sed s,am_,,g |\ + sed -e "s,Plus,+,g;s,Minus,-,g;s,Neqeq,=\/=,g;s,Neq,\/=,g;s,Div,\/,g;s,Eqeq,=\:=,g;s,Eq,==,g;s,Ge,>=,g;s,Gt,>,g;s,Le,=<,g;s,Lt,<,g;s,Times,*,g;s,subtract,--,g;s,append\,,++\,,g" |\ + awk -F \, '{print "erlang(" $1 ":" $2 "/" $3 ")" }' + + # Add BIFs for HiPE + grep "bif " $BUILDDIR/erts/emulator/hipe/*.tab | awk -F "bif " '{print "erlang(" $2 ")"}' + ;; + "wx") + echo "erlang($basename) = $basever" + ;; + *) + ;; + esac +done + +# Get the list of *.beam files +beamfiles=$(echo $filelist | tr [:blank:] '\n' | grep -o -E '.*/ebin/.*\.beam$') +/usr/lib/rpm/erlang-find-provides.escript $beamfiles | sed s,\',,g + diff --git a/erlang-find-requires.escript b/erlang-find-requires.escript new file mode 100755 index 0000000..1a16f76 --- /dev/null +++ b/erlang-find-requires.escript @@ -0,0 +1,19 @@ +#!/usr/bin/escript +%% -*- erlang -*- + +main(EbinFiles) -> + lists:foreach( + fun(BeamFile) -> + try + {ok, {_Module, [{imports,Imports}]}} = beam_lib:chunks(BeamFile, [imports]), + lists:foreach( fun({ModName,ModFun,Arity})->io:format("erlang(~s:~s/~p)~n", [ModName,ModFun,Arity]) end, Imports) + catch + _:_ -> + ok + end + end, + EbinFiles); + +main(_) -> + halt(1). + diff --git a/erlang-find-requires.sh b/erlang-find-requires.sh new file mode 100755 index 0000000..de6a87f --- /dev/null +++ b/erlang-find-requires.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +# This script reads filenames from STDIN and outputs any relevant requires +# information that needs to be included in the package. + +filelist=`sed "s/['\"]/\\\&/g"` + +/usr/lib/rpm/rpmdeps --requires $filelist + +# Get the list of *.app files +appfiles=$(echo $filelist | tr [:blank:] '\n' | grep -o -E '.*/ebin/.*\.app$') + +for f in $appfiles; do + apps=`cat $f | tr -d [:space:] | grep -o -E '\{applications,\[.*[a-zA-Z0-9_]\]\}' | sed -e "s,.*\[,,g;s,\].*,,g;s.,. .g"` + for a in $apps; do + echo "erlang($a)" + done +done + +# Get the list of *.beam files +beamfiles=$(echo $filelist | tr [:blank:] '\n' | grep -o -E '.*/ebin/.*\.beam$') +/usr/lib/rpm/erlang-find-requires.escript $beamfiles | sort | uniq + diff --git a/erlang.spec b/erlang.spec index b53835d..d157cfb 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.2%{?dist} +Release: %{rel}.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -12,6 +12,11 @@ URL: http://www.erlang.org Source: http://www.erlang.org/download/otp_src_%{ver}%{rel}.tar.gz Source1: http://www.erlang.org/download/otp_doc_html_%{ver}%{rel}.tar.gz Source2: http://www.erlang.org/download/otp_doc_man_%{ver}%{rel}.tar.gz +Source3: erlang-find-provides.escript +Source4: erlang-find-provides.sh +Source5: erlang-find-requires.escript +Source6: erlang-find-requires.sh +Source7: macros.erlang # TODO this patch needs rebase against current tree Patch0: otp-links.patch Patch1: otp-0001-Do-not-format-man-pages.patch @@ -75,9 +80,11 @@ 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 -# doc +# install additional doc files mkdir -p erlang_doc tar -C erlang_doc -zxf %{SOURCE1} + +# install man-pages tar -C $RPM_BUILD_ROOT%{_libdir}/erlang -zxf %{SOURCE2} gzip $RPM_BUILD_ROOT%{_libdir}/erlang/man/man*/* @@ -94,9 +101,33 @@ cd $RPM_BUILD_ROOT%{_libdir}/erlang sed -i "s|$RPM_BUILD_ROOT||" erts*/bin/{erl,start} releases/RELEASES bin/{erl,start} # 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 "*.[yh]rl" -print -delete || true ; done +for d in $RPM_BUILD_ROOT%{_libdir}/erlang/lib/* ; do find $d/src -maxdepth 1 -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 +# remove C and Java sources +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/c_src +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/erl_interface-*/src +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ic-*/c_src +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ic-*/java_src +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 +rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/doc +rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/man +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 +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/misc + # fix permissions for asn1 library chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/priv/lib/asn1_erl_drv.so @@ -107,6 +138,13 @@ chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/megaco-*/priv/lib/megaco_flex_sca # fix permissons for wx library chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/wx-*/priv/*/wxe_driver.so +# 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 +install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-requires.escript +install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-requires.sh +install -D -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.erlang + %clean rm -rf $RPM_BUILD_ROOT @@ -118,6 +156,13 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %{_libdir}/erlang +# RPM stuff +%{_sysconfdir}/rpm/macros.erlang +%{_libdir}/rpm/erlang-find-provides.escript +%{_libdir}/rpm/erlang-find-provides.sh +%{_libdir}/rpm/erlang-find-requires.escript +%{_libdir}/rpm/erlang-find-requires.sh + %files doc %defattr(-,root,root) @@ -129,6 +174,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 26 2010 Peter Lemenkov - R13B-04.3 +- Added rpm-related stuff for auto-generating erlang dependencies in the future builds +- Since now *.yrl files are removed too. +- Removed unnecessary C and Java sources + * Fri Mar 26 2010 Peter Lemenkov - R13B-04.2 - Do not remove all files from %%{_libdir}/erlang/lib/*/src - keep *.[yh]rl intact diff --git a/import.log b/import.log index e66036f..d30e123 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ erlang-R13B-04_1_fc12:F-13:erlang-R13B-04.1.fc12.src.rpm:1268646179 erlang-R13B-04_2_fc12:F-13:erlang-R13B-04.2.fc12.src.rpm:1269608961 +erlang-R13B-04_3_fc12:F-13:erlang-R13B-04.3.fc12.src.rpm:1271239209 diff --git a/macros.erlang b/macros.erlang new file mode 100644 index 0000000..88542e0 --- /dev/null +++ b/macros.erlang @@ -0,0 +1,13 @@ +# handy macros for erlang-related packages + +%_erldir %{_libdir}/erlang +%_erllibdir %{_erldir}/lib + +%__erlang_provides %{_rpmconfigdir}/erlang-find-provides.sh -b %{_builddir}/%{buildsubdir} -- +%__erlang_requires %{_rpmconfigdir}/erlang-find-requires.sh + +%__erlang_provides_requires \ +%global _use_internal_dependency_generator 0\ +%global __find_provides %__erlang_provides\ +%global __find_requires %__erlang_requires\ +%{nil} -- cgit From 7748c21bb98ce88bbfa4357cb65f901c8e41c8d4 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 14 Apr 2010 10:03:40 +0000 Subject: Added rpm macros and more cleanups --- erlang-find-provides.escript | 24 +++++++++++ erlang-find-provides.sh | 97 ++++++++++++++++++++++++++++++++++++++++++++ erlang-find-requires.escript | 19 +++++++++ erlang-find-requires.sh | 23 +++++++++++ erlang.spec | 56 +++++++++++++++++++++++-- import.log | 1 + macros.erlang | 13 ++++++ 7 files changed, 230 insertions(+), 3 deletions(-) create mode 100755 erlang-find-provides.escript create mode 100755 erlang-find-provides.sh create mode 100755 erlang-find-requires.escript create mode 100755 erlang-find-requires.sh create mode 100644 macros.erlang diff --git a/erlang-find-provides.escript b/erlang-find-provides.escript new file mode 100755 index 0000000..4433337 --- /dev/null +++ b/erlang-find-provides.escript @@ -0,0 +1,24 @@ +#!/usr/bin/escript +%% -*- erlang -*- + +main(EbinFiles) -> + lists:foreach( + fun(BeamFile) -> + try + {ok, {Module, [{exports,Exports}]}} = beam_lib:chunks(BeamFile, [exports]), + case Module of + eunit_test -> io:format ("erlang(eunit_test:nonexisting_function/0)~n"); + wx -> io:format ("erlang(demo:start/0)~n"); + _ -> ok + end, + lists:foreach( fun({ModFun,Arity})->io:format("erlang(~p:~s/~p)~n", [Module, ModFun,Arity]) end, Exports) + catch + _:_ -> + ok + end + end, + EbinFiles); + +main(_) -> + halt(1). + diff --git a/erlang-find-provides.sh b/erlang-find-provides.sh new file mode 100755 index 0000000..0592130 --- /dev/null +++ b/erlang-find-provides.sh @@ -0,0 +1,97 @@ +#!/bin/bash + +# This script reads filenames from STDIN and outputs any relevant provides +# information that needs to be included in the package. + +BUILDDIR= + +while true; do + case "$1" in + -b) BUILDDIR="$2"; shift 2;; + --) shift; break;; + *) echo "$0: option error at $1"; exit 1;; + esac +done + +filelist=`sed "s/['\"]/\\\&/g"` + +/usr/lib/rpm/rpmdeps --provides $filelist + +# Get the list of *.app files +appfiles=$(echo $filelist | tr [:blank:] '\n' | grep -o -E '.*/ebin/.*\.app$') + +for f in $appfiles; do + app=`cat $f | tr -d [:space:] | awk -F '{application,' '{print $2}'|cut -d , -f 1` + ver=`cat $f | tr -d [:space:] | grep -o -E '\{vsn,\".*[0-9]\"\}' | sed -e "s,.vsn\,\",,g;s,\".,,g"` + + # HiPE module is different from others + if [ "$app" == "hipe" ] ; + then + # Hardcoded minimal set of HiPE exported functions + echo "erlang(hipe_amd64_main:rtl_to_amd64/3)" + echo "erlang(hipe_arm_main:rtl_to_arm/3)" + echo "erlang(hipe:c/1)" + echo "erlang(hipe:compile/4)" + echo "erlang(hipe_data_pp:pp/4)" + echo "erlang(hipe_icode2rtl:translate/2)" + echo "erlang(hipe_icode_heap_test:cfg/1)" + echo "erlang(hipe_ppc_main:rtl_to_ppc/3)" + echo "erlang(hipe_rtl_arch:endianess/0)" + echo "erlang(hipe_rtl_arch:nr_of_return_regs/0)" + echo "erlang(hipe_rtl_arch:word_size/0)" + echo "erlang(hipe_rtl_cfg:init/1)" + echo "erlang(hipe_rtl_cfg:linearize/1)" + echo "erlang(hipe_rtl_cfg:pp/1)" + echo "erlang(hipe_rtl_cfg:remove_trivial_bbs/1)" + echo "erlang(hipe_rtl_cfg:remove_unreachable_code/1)" + echo "erlang(hipe_rtl_cleanup_const:cleanup/1)" + echo "erlang(hipe_rtl_lcm:rtl_lcm/2)" + echo "erlang(hipe_rtl_ssa_avail_expr:cfg/1)" + echo "erlang(hipe_rtl_ssa:check/1)" + echo "erlang(hipe_rtl_ssa_const_prop:propagate/1)" + echo "erlang(hipe_rtl_ssa:convert/1)" + echo "erlang(hipe_rtl_ssapre:rtl_ssapre/2)" + echo "erlang(hipe_rtl_ssa:remove_dead_code/1)" + echo "erlang(hipe_rtl_ssa:unconvert/1)" + echo "erlang(hipe_rtl_symbolic:expand/1)" + echo "erlang(hipe_sparc_main:rtl_to_sparc/3)" + echo "erlang(hipe_tagscheme:fixnum_val/1)" + echo "erlang(hipe_tagscheme:is_fixnum/1)" + echo "erlang(hipe_x86_main:rtl_to_x86/3)" + fi + + echo "erlang($app) = $ver" +done + +# Check for very special case - erts, by guessing by directory name +basedirs=$(echo $filelist | tr [:blank:] '\n' | grep -o -E 'erlang\/lib\/[a-zA-Z_0-9]*-[0-9.]*\/ebin' | cut -d \/ -f 3 | sort | uniq) +for bd in $basedirs; do + basename=`echo $bd | cut -d \- -f 1` + basever=`echo $bd | cut -d \- -f 2` + case $basename in + "erts") + echo "erlang($basename) = $basever" + + # BIFs from erts - this module is very specific + cat $BUILDDIR/erts/emulator/*/erl_bif_list.h 2>/dev/null |\ + grep -v am__AtomAlias |\ + grep -o -E 'am_.*\,am_.*\,.\,' |\ + sed s,am_,,g |\ + sed -e "s,Plus,+,g;s,Minus,-,g;s,Neqeq,=\/=,g;s,Neq,\/=,g;s,Div,\/,g;s,Eqeq,=\:=,g;s,Eq,==,g;s,Ge,>=,g;s,Gt,>,g;s,Le,=<,g;s,Lt,<,g;s,Times,*,g;s,subtract,--,g;s,append\,,++\,,g" |\ + awk -F \, '{print "erlang(" $1 ":" $2 "/" $3 ")" }' + + # Add BIFs for HiPE + grep "bif " $BUILDDIR/erts/emulator/hipe/*.tab | awk -F "bif " '{print "erlang(" $2 ")"}' + ;; + "wx") + echo "erlang($basename) = $basever" + ;; + *) + ;; + esac +done + +# Get the list of *.beam files +beamfiles=$(echo $filelist | tr [:blank:] '\n' | grep -o -E '.*/ebin/.*\.beam$') +/usr/lib/rpm/erlang-find-provides.escript $beamfiles | sed s,\',,g + diff --git a/erlang-find-requires.escript b/erlang-find-requires.escript new file mode 100755 index 0000000..1a16f76 --- /dev/null +++ b/erlang-find-requires.escript @@ -0,0 +1,19 @@ +#!/usr/bin/escript +%% -*- erlang -*- + +main(EbinFiles) -> + lists:foreach( + fun(BeamFile) -> + try + {ok, {_Module, [{imports,Imports}]}} = beam_lib:chunks(BeamFile, [imports]), + lists:foreach( fun({ModName,ModFun,Arity})->io:format("erlang(~s:~s/~p)~n", [ModName,ModFun,Arity]) end, Imports) + catch + _:_ -> + ok + end + end, + EbinFiles); + +main(_) -> + halt(1). + diff --git a/erlang-find-requires.sh b/erlang-find-requires.sh new file mode 100755 index 0000000..de6a87f --- /dev/null +++ b/erlang-find-requires.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +# This script reads filenames from STDIN and outputs any relevant requires +# information that needs to be included in the package. + +filelist=`sed "s/['\"]/\\\&/g"` + +/usr/lib/rpm/rpmdeps --requires $filelist + +# Get the list of *.app files +appfiles=$(echo $filelist | tr [:blank:] '\n' | grep -o -E '.*/ebin/.*\.app$') + +for f in $appfiles; do + apps=`cat $f | tr -d [:space:] | grep -o -E '\{applications,\[.*[a-zA-Z0-9_]\]\}' | sed -e "s,.*\[,,g;s,\].*,,g;s.,. .g"` + for a in $apps; do + echo "erlang($a)" + done +done + +# Get the list of *.beam files +beamfiles=$(echo $filelist | tr [:blank:] '\n' | grep -o -E '.*/ebin/.*\.beam$') +/usr/lib/rpm/erlang-find-requires.escript $beamfiles | sort | uniq + diff --git a/erlang.spec b/erlang.spec index b53835d..d157cfb 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.2%{?dist} +Release: %{rel}.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -12,6 +12,11 @@ URL: http://www.erlang.org Source: http://www.erlang.org/download/otp_src_%{ver}%{rel}.tar.gz Source1: http://www.erlang.org/download/otp_doc_html_%{ver}%{rel}.tar.gz Source2: http://www.erlang.org/download/otp_doc_man_%{ver}%{rel}.tar.gz +Source3: erlang-find-provides.escript +Source4: erlang-find-provides.sh +Source5: erlang-find-requires.escript +Source6: erlang-find-requires.sh +Source7: macros.erlang # TODO this patch needs rebase against current tree Patch0: otp-links.patch Patch1: otp-0001-Do-not-format-man-pages.patch @@ -75,9 +80,11 @@ 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 -# doc +# install additional doc files mkdir -p erlang_doc tar -C erlang_doc -zxf %{SOURCE1} + +# install man-pages tar -C $RPM_BUILD_ROOT%{_libdir}/erlang -zxf %{SOURCE2} gzip $RPM_BUILD_ROOT%{_libdir}/erlang/man/man*/* @@ -94,9 +101,33 @@ cd $RPM_BUILD_ROOT%{_libdir}/erlang sed -i "s|$RPM_BUILD_ROOT||" erts*/bin/{erl,start} releases/RELEASES bin/{erl,start} # 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 "*.[yh]rl" -print -delete || true ; done +for d in $RPM_BUILD_ROOT%{_libdir}/erlang/lib/* ; do find $d/src -maxdepth 1 -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 +# remove C and Java sources +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/c_src +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/erl_interface-*/src +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ic-*/c_src +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ic-*/java_src +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 +rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/doc +rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/man +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 +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/misc + # fix permissions for asn1 library chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/priv/lib/asn1_erl_drv.so @@ -107,6 +138,13 @@ chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/megaco-*/priv/lib/megaco_flex_sca # fix permissons for wx library chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/wx-*/priv/*/wxe_driver.so +# 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 +install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-requires.escript +install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-requires.sh +install -D -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.erlang + %clean rm -rf $RPM_BUILD_ROOT @@ -118,6 +156,13 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %{_libdir}/erlang +# RPM stuff +%{_sysconfdir}/rpm/macros.erlang +%{_libdir}/rpm/erlang-find-provides.escript +%{_libdir}/rpm/erlang-find-provides.sh +%{_libdir}/rpm/erlang-find-requires.escript +%{_libdir}/rpm/erlang-find-requires.sh + %files doc %defattr(-,root,root) @@ -129,6 +174,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 26 2010 Peter Lemenkov - R13B-04.3 +- Added rpm-related stuff for auto-generating erlang dependencies in the future builds +- Since now *.yrl files are removed too. +- Removed unnecessary C and Java sources + * Fri Mar 26 2010 Peter Lemenkov - R13B-04.2 - Do not remove all files from %%{_libdir}/erlang/lib/*/src - keep *.[yh]rl intact diff --git a/import.log b/import.log index 9a70af5..5537ce7 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ erlang-R13B-04_1_fc12:F-12:erlang-R13B-04.1.fc12.src.rpm:1268837646 erlang-R13B-04_2_fc12:F-12:erlang-R13B-04.2.fc12.src.rpm:1269609314 +erlang-R13B-04_3_fc12:F-12:erlang-R13B-04.3.fc12.src.rpm:1271239367 diff --git a/macros.erlang b/macros.erlang new file mode 100644 index 0000000..88542e0 --- /dev/null +++ b/macros.erlang @@ -0,0 +1,13 @@ +# handy macros for erlang-related packages + +%_erldir %{_libdir}/erlang +%_erllibdir %{_erldir}/lib + +%__erlang_provides %{_rpmconfigdir}/erlang-find-provides.sh -b %{_builddir}/%{buildsubdir} -- +%__erlang_requires %{_rpmconfigdir}/erlang-find-requires.sh + +%__erlang_provides_requires \ +%global _use_internal_dependency_generator 0\ +%global __find_provides %__erlang_provides\ +%global __find_requires %__erlang_requires\ +%{nil} -- cgit From 328521c9ee3b05b154cd5bf5ef76506e7f284d58 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 14 Apr 2010 10:03:40 +0000 Subject: Added rpm macros and more cleanups --- erlang-find-provides.escript | 24 +++++++++++ erlang-find-provides.sh | 97 ++++++++++++++++++++++++++++++++++++++++++++ erlang-find-requires.escript | 19 +++++++++ erlang-find-requires.sh | 23 +++++++++++ erlang.spec | 56 +++++++++++++++++++++++-- import.log | 1 + macros.erlang | 13 ++++++ 7 files changed, 230 insertions(+), 3 deletions(-) create mode 100755 erlang-find-provides.escript create mode 100755 erlang-find-provides.sh create mode 100755 erlang-find-requires.escript create mode 100755 erlang-find-requires.sh create mode 100644 macros.erlang diff --git a/erlang-find-provides.escript b/erlang-find-provides.escript new file mode 100755 index 0000000..4433337 --- /dev/null +++ b/erlang-find-provides.escript @@ -0,0 +1,24 @@ +#!/usr/bin/escript +%% -*- erlang -*- + +main(EbinFiles) -> + lists:foreach( + fun(BeamFile) -> + try + {ok, {Module, [{exports,Exports}]}} = beam_lib:chunks(BeamFile, [exports]), + case Module of + eunit_test -> io:format ("erlang(eunit_test:nonexisting_function/0)~n"); + wx -> io:format ("erlang(demo:start/0)~n"); + _ -> ok + end, + lists:foreach( fun({ModFun,Arity})->io:format("erlang(~p:~s/~p)~n", [Module, ModFun,Arity]) end, Exports) + catch + _:_ -> + ok + end + end, + EbinFiles); + +main(_) -> + halt(1). + diff --git a/erlang-find-provides.sh b/erlang-find-provides.sh new file mode 100755 index 0000000..0592130 --- /dev/null +++ b/erlang-find-provides.sh @@ -0,0 +1,97 @@ +#!/bin/bash + +# This script reads filenames from STDIN and outputs any relevant provides +# information that needs to be included in the package. + +BUILDDIR= + +while true; do + case "$1" in + -b) BUILDDIR="$2"; shift 2;; + --) shift; break;; + *) echo "$0: option error at $1"; exit 1;; + esac +done + +filelist=`sed "s/['\"]/\\\&/g"` + +/usr/lib/rpm/rpmdeps --provides $filelist + +# Get the list of *.app files +appfiles=$(echo $filelist | tr [:blank:] '\n' | grep -o -E '.*/ebin/.*\.app$') + +for f in $appfiles; do + app=`cat $f | tr -d [:space:] | awk -F '{application,' '{print $2}'|cut -d , -f 1` + ver=`cat $f | tr -d [:space:] | grep -o -E '\{vsn,\".*[0-9]\"\}' | sed -e "s,.vsn\,\",,g;s,\".,,g"` + + # HiPE module is different from others + if [ "$app" == "hipe" ] ; + then + # Hardcoded minimal set of HiPE exported functions + echo "erlang(hipe_amd64_main:rtl_to_amd64/3)" + echo "erlang(hipe_arm_main:rtl_to_arm/3)" + echo "erlang(hipe:c/1)" + echo "erlang(hipe:compile/4)" + echo "erlang(hipe_data_pp:pp/4)" + echo "erlang(hipe_icode2rtl:translate/2)" + echo "erlang(hipe_icode_heap_test:cfg/1)" + echo "erlang(hipe_ppc_main:rtl_to_ppc/3)" + echo "erlang(hipe_rtl_arch:endianess/0)" + echo "erlang(hipe_rtl_arch:nr_of_return_regs/0)" + echo "erlang(hipe_rtl_arch:word_size/0)" + echo "erlang(hipe_rtl_cfg:init/1)" + echo "erlang(hipe_rtl_cfg:linearize/1)" + echo "erlang(hipe_rtl_cfg:pp/1)" + echo "erlang(hipe_rtl_cfg:remove_trivial_bbs/1)" + echo "erlang(hipe_rtl_cfg:remove_unreachable_code/1)" + echo "erlang(hipe_rtl_cleanup_const:cleanup/1)" + echo "erlang(hipe_rtl_lcm:rtl_lcm/2)" + echo "erlang(hipe_rtl_ssa_avail_expr:cfg/1)" + echo "erlang(hipe_rtl_ssa:check/1)" + echo "erlang(hipe_rtl_ssa_const_prop:propagate/1)" + echo "erlang(hipe_rtl_ssa:convert/1)" + echo "erlang(hipe_rtl_ssapre:rtl_ssapre/2)" + echo "erlang(hipe_rtl_ssa:remove_dead_code/1)" + echo "erlang(hipe_rtl_ssa:unconvert/1)" + echo "erlang(hipe_rtl_symbolic:expand/1)" + echo "erlang(hipe_sparc_main:rtl_to_sparc/3)" + echo "erlang(hipe_tagscheme:fixnum_val/1)" + echo "erlang(hipe_tagscheme:is_fixnum/1)" + echo "erlang(hipe_x86_main:rtl_to_x86/3)" + fi + + echo "erlang($app) = $ver" +done + +# Check for very special case - erts, by guessing by directory name +basedirs=$(echo $filelist | tr [:blank:] '\n' | grep -o -E 'erlang\/lib\/[a-zA-Z_0-9]*-[0-9.]*\/ebin' | cut -d \/ -f 3 | sort | uniq) +for bd in $basedirs; do + basename=`echo $bd | cut -d \- -f 1` + basever=`echo $bd | cut -d \- -f 2` + case $basename in + "erts") + echo "erlang($basename) = $basever" + + # BIFs from erts - this module is very specific + cat $BUILDDIR/erts/emulator/*/erl_bif_list.h 2>/dev/null |\ + grep -v am__AtomAlias |\ + grep -o -E 'am_.*\,am_.*\,.\,' |\ + sed s,am_,,g |\ + sed -e "s,Plus,+,g;s,Minus,-,g;s,Neqeq,=\/=,g;s,Neq,\/=,g;s,Div,\/,g;s,Eqeq,=\:=,g;s,Eq,==,g;s,Ge,>=,g;s,Gt,>,g;s,Le,=<,g;s,Lt,<,g;s,Times,*,g;s,subtract,--,g;s,append\,,++\,,g" |\ + awk -F \, '{print "erlang(" $1 ":" $2 "/" $3 ")" }' + + # Add BIFs for HiPE + grep "bif " $BUILDDIR/erts/emulator/hipe/*.tab | awk -F "bif " '{print "erlang(" $2 ")"}' + ;; + "wx") + echo "erlang($basename) = $basever" + ;; + *) + ;; + esac +done + +# Get the list of *.beam files +beamfiles=$(echo $filelist | tr [:blank:] '\n' | grep -o -E '.*/ebin/.*\.beam$') +/usr/lib/rpm/erlang-find-provides.escript $beamfiles | sed s,\',,g + diff --git a/erlang-find-requires.escript b/erlang-find-requires.escript new file mode 100755 index 0000000..1a16f76 --- /dev/null +++ b/erlang-find-requires.escript @@ -0,0 +1,19 @@ +#!/usr/bin/escript +%% -*- erlang -*- + +main(EbinFiles) -> + lists:foreach( + fun(BeamFile) -> + try + {ok, {_Module, [{imports,Imports}]}} = beam_lib:chunks(BeamFile, [imports]), + lists:foreach( fun({ModName,ModFun,Arity})->io:format("erlang(~s:~s/~p)~n", [ModName,ModFun,Arity]) end, Imports) + catch + _:_ -> + ok + end + end, + EbinFiles); + +main(_) -> + halt(1). + diff --git a/erlang-find-requires.sh b/erlang-find-requires.sh new file mode 100755 index 0000000..de6a87f --- /dev/null +++ b/erlang-find-requires.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +# This script reads filenames from STDIN and outputs any relevant requires +# information that needs to be included in the package. + +filelist=`sed "s/['\"]/\\\&/g"` + +/usr/lib/rpm/rpmdeps --requires $filelist + +# Get the list of *.app files +appfiles=$(echo $filelist | tr [:blank:] '\n' | grep -o -E '.*/ebin/.*\.app$') + +for f in $appfiles; do + apps=`cat $f | tr -d [:space:] | grep -o -E '\{applications,\[.*[a-zA-Z0-9_]\]\}' | sed -e "s,.*\[,,g;s,\].*,,g;s.,. .g"` + for a in $apps; do + echo "erlang($a)" + done +done + +# Get the list of *.beam files +beamfiles=$(echo $filelist | tr [:blank:] '\n' | grep -o -E '.*/ebin/.*\.beam$') +/usr/lib/rpm/erlang-find-requires.escript $beamfiles | sort | uniq + diff --git a/erlang.spec b/erlang.spec index b53835d..d157cfb 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.2%{?dist} +Release: %{rel}.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -12,6 +12,11 @@ URL: http://www.erlang.org Source: http://www.erlang.org/download/otp_src_%{ver}%{rel}.tar.gz Source1: http://www.erlang.org/download/otp_doc_html_%{ver}%{rel}.tar.gz Source2: http://www.erlang.org/download/otp_doc_man_%{ver}%{rel}.tar.gz +Source3: erlang-find-provides.escript +Source4: erlang-find-provides.sh +Source5: erlang-find-requires.escript +Source6: erlang-find-requires.sh +Source7: macros.erlang # TODO this patch needs rebase against current tree Patch0: otp-links.patch Patch1: otp-0001-Do-not-format-man-pages.patch @@ -75,9 +80,11 @@ 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 -# doc +# install additional doc files mkdir -p erlang_doc tar -C erlang_doc -zxf %{SOURCE1} + +# install man-pages tar -C $RPM_BUILD_ROOT%{_libdir}/erlang -zxf %{SOURCE2} gzip $RPM_BUILD_ROOT%{_libdir}/erlang/man/man*/* @@ -94,9 +101,33 @@ cd $RPM_BUILD_ROOT%{_libdir}/erlang sed -i "s|$RPM_BUILD_ROOT||" erts*/bin/{erl,start} releases/RELEASES bin/{erl,start} # 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 "*.[yh]rl" -print -delete || true ; done +for d in $RPM_BUILD_ROOT%{_libdir}/erlang/lib/* ; do find $d/src -maxdepth 1 -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 +# remove C and Java sources +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/c_src +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/erl_interface-*/src +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ic-*/c_src +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ic-*/java_src +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 +rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/doc +rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/man +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 +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/misc + # fix permissions for asn1 library chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/priv/lib/asn1_erl_drv.so @@ -107,6 +138,13 @@ chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/megaco-*/priv/lib/megaco_flex_sca # fix permissons for wx library chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/wx-*/priv/*/wxe_driver.so +# 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 +install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-requires.escript +install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-requires.sh +install -D -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.erlang + %clean rm -rf $RPM_BUILD_ROOT @@ -118,6 +156,13 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %{_libdir}/erlang +# RPM stuff +%{_sysconfdir}/rpm/macros.erlang +%{_libdir}/rpm/erlang-find-provides.escript +%{_libdir}/rpm/erlang-find-provides.sh +%{_libdir}/rpm/erlang-find-requires.escript +%{_libdir}/rpm/erlang-find-requires.sh + %files doc %defattr(-,root,root) @@ -129,6 +174,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 26 2010 Peter Lemenkov - R13B-04.3 +- Added rpm-related stuff for auto-generating erlang dependencies in the future builds +- Since now *.yrl files are removed too. +- Removed unnecessary C and Java sources + * Fri Mar 26 2010 Peter Lemenkov - R13B-04.2 - Do not remove all files from %%{_libdir}/erlang/lib/*/src - keep *.[yh]rl intact diff --git a/import.log b/import.log index 9a70af5..5537ce7 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ erlang-R13B-04_1_fc12:F-12:erlang-R13B-04.1.fc12.src.rpm:1268837646 erlang-R13B-04_2_fc12:F-12:erlang-R13B-04.2.fc12.src.rpm:1269609314 +erlang-R13B-04_3_fc12:F-12:erlang-R13B-04.3.fc12.src.rpm:1271239367 diff --git a/macros.erlang b/macros.erlang new file mode 100644 index 0000000..88542e0 --- /dev/null +++ b/macros.erlang @@ -0,0 +1,13 @@ +# handy macros for erlang-related packages + +%_erldir %{_libdir}/erlang +%_erllibdir %{_erldir}/lib + +%__erlang_provides %{_rpmconfigdir}/erlang-find-provides.sh -b %{_builddir}/%{buildsubdir} -- +%__erlang_requires %{_rpmconfigdir}/erlang-find-requires.sh + +%__erlang_provides_requires \ +%global _use_internal_dependency_generator 0\ +%global __find_provides %__erlang_provides\ +%global __find_requires %__erlang_requires\ +%{nil} -- cgit From a8e7f10d8475813221a7c1946c66bd0f1b8965f7 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 17 Apr 2010 17:03:55 +0000 Subject: Fix few minor outstanding issues before splitting into pieces --- erlang.spec | 33 ++++++++---- import.log | 1 + otp-0001-Do-not-format-man-pages.patch | 4 +- otp-0002-Remove-rpath.patch | 4 +- otp-0006-Fix-shared-libraries-installation.patch | 58 ++++++++++++++++++++++ otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch | 35 +++++++++++++ ...-Fix-check-for-compile-workspace-overflow.patch | 55 ++++++++++++++++++++ 7 files changed, 175 insertions(+), 15 deletions(-) create mode 100644 otp-0006-Fix-shared-libraries-installation.patch create mode 100644 otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch create mode 100644 otp-0008-Fix-check-for-compile-workspace-overflow.patch diff --git a/erlang.spec b/erlang.spec index d157cfb..eb436fa 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.3%{?dist} +Release: %{rel}.4%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -19,8 +19,16 @@ Source6: erlang-find-requires.sh Source7: macros.erlang # TODO this patch needs rebase against current tree Patch0: otp-links.patch +# Fedora-specific Patch1: otp-0001-Do-not-format-man-pages.patch +# Fedora-specific Patch2: otp-0002-Remove-rpath.patch +# Upstreamed +Patch6: otp-0006-Fix-shared-libraries-installation.patch +# Fedora-specific +Patch7: otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch +# Upstreamed +Patch8: otp-0008-Fix-check-for-compile-workspace-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -36,6 +44,9 @@ BuildRequires: m4 BuildRequires: fop Requires: tk +Requires: mesa-libGL +Requires: mesa-libGLU + %description Erlang is a general-purpose programming language and runtime @@ -47,6 +58,8 @@ systems from Ericsson. %package doc Summary: Erlang documentation Group: Development/Languages +BuildArch: noarch +Obsoletes: %{name}-doc < R13B-04.4 %description doc Documentation for Erlang. @@ -56,6 +69,9 @@ Documentation for Erlang. %setup -q -n otp_src_%{ver}%{rel} %patch1 -p1 -b .do_not_format_manpages %patch2 -p1 -b .rpath +%patch6 -p1 -b .fix_shared_lib_install +%patch7 -p1 -b .dlopen_opengl_libs +%patch8 -p1 -b .pcre_overflow # remove shipped zlib sources rm -f erts/emulator/zlib/*.[ch] @@ -128,16 +144,6 @@ rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/lib/odbc-*/priv/obj rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/priv/obj rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/misc -# fix permissions for asn1 library -chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/priv/lib/asn1_erl_drv.so - -# fix permissions for megaco library -chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/megaco-*/priv/lib/megaco_flex_scanner_drv.so -chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/megaco-*/priv/lib/megaco_flex_scanner_drv_mt.so - -# fix permissons for wx library -chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/wx-*/priv/*/wxe_driver.so - # 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 @@ -174,6 +180,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Apr 17 2010 Peter Lemenkov - R13B-04.4 +- Added missing Requires mesa-libGL{U} for wx module (rhbz #583287) +- Fix for buffer overflow in pcre module (rhbz #583288) +- Doc sub-package marked as noarch (partially resolves rhbz #491165) + * Fri Mar 26 2010 Peter Lemenkov - R13B-04.3 - Added rpm-related stuff for auto-generating erlang dependencies in the future builds - Since now *.yrl files are removed too. diff --git a/import.log b/import.log index d30e123..af5b7b5 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ erlang-R13B-04_1_fc12:F-13:erlang-R13B-04.1.fc12.src.rpm:1268646179 erlang-R13B-04_2_fc12:F-13:erlang-R13B-04.2.fc12.src.rpm:1269608961 erlang-R13B-04_3_fc12:F-13:erlang-R13B-04.3.fc12.src.rpm:1271239209 +erlang-R13B-04_4_fc12:F-13:erlang-R13B-04.4.fc12.src.rpm:1271523813 diff --git a/otp-0001-Do-not-format-man-pages.patch b/otp-0001-Do-not-format-man-pages.patch index 61e089e..5f9594f 100644 --- a/otp-0001-Do-not-format-man-pages.patch +++ b/otp-0001-Do-not-format-man-pages.patch @@ -1,7 +1,7 @@ From 80fd602b5cd9f4aaa7b6bd95e174708e27601db5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 25 Feb 2010 16:45:28 +0300 -Subject: [PATCH 1/2] Do not format man-pages +Subject: [PATCH 1/9] Do not format man-pages Signed-off-by: Peter Lemenkov --- @@ -28,5 +28,5 @@ index 83f9690..d26137d 100644 - exit 0 -- -1.6.2.5 +1.6.6.1 diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index ffc6cde..0293073 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -1,7 +1,7 @@ From 2e10f728feb56ea96b2832999a8c34f1f19646bc Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 25 Feb 2010 16:57:43 +0300 -Subject: [PATCH 2/2] Remove rpath +Subject: [PATCH 2/9] Remove rpath Signed-off-by: Peter Lemenkov --- @@ -68,5 +68,5 @@ index 49a209f..5e6c74e 100644 SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@ -- -1.6.2.5 +1.6.6.1 diff --git a/otp-0006-Fix-shared-libraries-installation.patch b/otp-0006-Fix-shared-libraries-installation.patch new file mode 100644 index 0000000..2df3cb4 --- /dev/null +++ b/otp-0006-Fix-shared-libraries-installation.patch @@ -0,0 +1,58 @@ +From 0c963550412174a4c4fe64aa7f70189998abef41 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 15 Apr 2010 13:31:36 +0400 +Subject: [PATCH 6/9] Fix shared libraries installation + +Several shared libraries (asn1_erl_drv.so, megaco_flex_scanner_drv_mt.so, +megaco_flex_scanner_drv.so, wxe_driver.so) were installed as data files +previously. + +Signed-off-by: Peter Lemenkov +--- + lib/asn1/c_src/Makefile | 2 +- + lib/megaco/src/flex/Makefile.in | 2 +- + lib/wx/c_src/Makefile.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile +index 906c513..9e9cb18 100644 +--- a/lib/asn1/c_src/Makefile ++++ b/lib/asn1/c_src/Makefile +@@ -124,7 +124,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/lib +- $(INSTALL_DATA) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib + $(INSTALL_DIR) $(RELSYSDIR)/c_src + $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src + +diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in +index 6ce9b34..5af651d 100644 +--- a/lib/megaco/src/flex/Makefile.in ++++ b/lib/megaco/src/flex/Makefile.in +@@ -280,7 +280,7 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) + $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex +- $(INSTALL_DATA) $(SOLIBS) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib + endif + + +diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in +index 5a0b4ce..8710641 100644 +--- a/lib/wx/c_src/Makefile.in ++++ b/lib/wx/c_src/Makefile.in +@@ -167,7 +167,7 @@ release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/$(SYS_TYPE) + $(INSTALL_DATA) ../priv/erlang-logo32.png $(RELSYSDIR)/priv/ + $(INSTALL_DATA) ../priv/erlang-logo64.png $(RELSYSDIR)/priv/ +- $(INSTALL_DATA) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) ++ $(INSTALL_PROGRAM) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) + + release_docs_spec: + +-- +1.6.6.1 + diff --git a/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch b/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch new file mode 100644 index 0000000..5e78c4a --- /dev/null +++ b/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch @@ -0,0 +1,35 @@ +From 6ffccff36e0d94cba0412cf3a29769b4a19d3be3 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Fri, 16 Apr 2010 21:13:47 +0400 +Subject: [PATCH 7/9] Fix for dlopening libGL and libGLU + +Signed-off-by: Peter Lemenkov +--- + lib/wx/c_src/wxe_gl.cpp | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp +index 63dd68f..36bf15f 100644 +--- a/lib/wx/c_src/wxe_gl.cpp ++++ b/lib/wx/c_src/wxe_gl.cpp +@@ -81,7 +81,7 @@ int initOpenGL() + WCHAR * DLName = wxT("opengl32.dll"); + HMODULE LIBhandle = LoadLibrary(DLName); + #else +- char * DLName = (char *) "libGL.so"; ++ char * DLName = (char *) "libGL.so.1"; + void * LIBhandle = dlopen(DLName, RTLD_LAZY); + #endif + // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); +@@ -132,7 +132,7 @@ int initOpenGL() + DLName = wxT("glu32.dll"); + LIBhandle = LoadLibrary(DLName); + #else +- DLName = (char *) "libGLU.so"; ++ DLName = (char *) "libGLU.so.1"; + LIBhandle = dlopen(DLName, RTLD_LAZY); + #endif + // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); +-- +1.6.6.1 + diff --git a/otp-0008-Fix-check-for-compile-workspace-overflow.patch b/otp-0008-Fix-check-for-compile-workspace-overflow.patch new file mode 100644 index 0000000..2e34451 --- /dev/null +++ b/otp-0008-Fix-check-for-compile-workspace-overflow.patch @@ -0,0 +1,55 @@ +From d496ce48940411976617b66a5c941c78313cb78c Mon Sep 17 00:00:00 2001 +From: Michael Santos +Date: Thu, 18 Mar 2010 20:08:10 -0400 +Subject: [PATCH 8/9] Fix check for compile workspace overflow + +Patch from: +http://vcs.pcre.org/viewvc/code/trunk/pcre_compile.c?r1=504&r2=505&view=patch + +Test case: +N = 819, re:compile([lists:duplicate(N, $(), lists:duplicate(N, $))]). + +Compiling large regular expressions could overflow the workspace +buffer. Modify the test to check for a value smaller than the buffer +size. +--- + erts/emulator/pcre/pcre_compile.c | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c +index 2974336..9508c5a 100644 +--- a/erts/emulator/pcre/pcre_compile.c ++++ b/erts/emulator/pcre/pcre_compile.c +@@ -92,6 +92,11 @@ is 4 there is plenty of room. */ + + #define COMPILE_WORK_SIZE (4096) + ++/* The overrun tests check for a slightly smaller size so that they detect the ++overrun before it actually does run off the end of the data block. */ ++ ++#define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100) ++ + + /* Table for handling escaped characters in the range '0'-'z'. Positive returns + are simple data values; negative values are for special things like \d and so +@@ -2445,7 +2450,7 @@ for (;; ptr++) + #ifdef DEBUG + if (code > cd->hwm) cd->hwm = code; /* High water info */ + #endif +- if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */ ++ if (code > cd->start_workspace + WORK_SIZE_CHECK) /* Check for overrun */ + { + *errorcodeptr = ERR52; + goto FAILED; +@@ -2494,7 +2499,7 @@ for (;; ptr++) + /* In the real compile phase, just check the workspace used by the forward + reference list. */ + +- else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE) ++ else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK) + { + *errorcodeptr = ERR52; + goto FAILED; +-- +1.6.6.1 + -- cgit From acb9d112f45ea5673f9cdf49405f800702e37af9 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 17 Apr 2010 17:05:52 +0000 Subject: Fix few minor outstanding issues before splitting into pieces --- erlang.spec | 33 ++++++++---- import.log | 1 + otp-0001-Do-not-format-man-pages.patch | 4 +- otp-0002-Remove-rpath.patch | 4 +- otp-0006-Fix-shared-libraries-installation.patch | 58 ++++++++++++++++++++++ otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch | 35 +++++++++++++ ...-Fix-check-for-compile-workspace-overflow.patch | 55 ++++++++++++++++++++ 7 files changed, 175 insertions(+), 15 deletions(-) create mode 100644 otp-0006-Fix-shared-libraries-installation.patch create mode 100644 otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch create mode 100644 otp-0008-Fix-check-for-compile-workspace-overflow.patch diff --git a/erlang.spec b/erlang.spec index d157cfb..eb436fa 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.3%{?dist} +Release: %{rel}.4%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -19,8 +19,16 @@ Source6: erlang-find-requires.sh Source7: macros.erlang # TODO this patch needs rebase against current tree Patch0: otp-links.patch +# Fedora-specific Patch1: otp-0001-Do-not-format-man-pages.patch +# Fedora-specific Patch2: otp-0002-Remove-rpath.patch +# Upstreamed +Patch6: otp-0006-Fix-shared-libraries-installation.patch +# Fedora-specific +Patch7: otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch +# Upstreamed +Patch8: otp-0008-Fix-check-for-compile-workspace-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -36,6 +44,9 @@ BuildRequires: m4 BuildRequires: fop Requires: tk +Requires: mesa-libGL +Requires: mesa-libGLU + %description Erlang is a general-purpose programming language and runtime @@ -47,6 +58,8 @@ systems from Ericsson. %package doc Summary: Erlang documentation Group: Development/Languages +BuildArch: noarch +Obsoletes: %{name}-doc < R13B-04.4 %description doc Documentation for Erlang. @@ -56,6 +69,9 @@ Documentation for Erlang. %setup -q -n otp_src_%{ver}%{rel} %patch1 -p1 -b .do_not_format_manpages %patch2 -p1 -b .rpath +%patch6 -p1 -b .fix_shared_lib_install +%patch7 -p1 -b .dlopen_opengl_libs +%patch8 -p1 -b .pcre_overflow # remove shipped zlib sources rm -f erts/emulator/zlib/*.[ch] @@ -128,16 +144,6 @@ rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/lib/odbc-*/priv/obj rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/priv/obj rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/misc -# fix permissions for asn1 library -chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/priv/lib/asn1_erl_drv.so - -# fix permissions for megaco library -chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/megaco-*/priv/lib/megaco_flex_scanner_drv.so -chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/megaco-*/priv/lib/megaco_flex_scanner_drv_mt.so - -# fix permissons for wx library -chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/wx-*/priv/*/wxe_driver.so - # 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 @@ -174,6 +180,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Apr 17 2010 Peter Lemenkov - R13B-04.4 +- Added missing Requires mesa-libGL{U} for wx module (rhbz #583287) +- Fix for buffer overflow in pcre module (rhbz #583288) +- Doc sub-package marked as noarch (partially resolves rhbz #491165) + * Fri Mar 26 2010 Peter Lemenkov - R13B-04.3 - Added rpm-related stuff for auto-generating erlang dependencies in the future builds - Since now *.yrl files are removed too. diff --git a/import.log b/import.log index 5537ce7..1ad99e1 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ erlang-R13B-04_1_fc12:F-12:erlang-R13B-04.1.fc12.src.rpm:1268837646 erlang-R13B-04_2_fc12:F-12:erlang-R13B-04.2.fc12.src.rpm:1269609314 erlang-R13B-04_3_fc12:F-12:erlang-R13B-04.3.fc12.src.rpm:1271239367 +erlang-R13B-04_4_fc12:F-12:erlang-R13B-04.4.fc12.src.rpm:1271523892 diff --git a/otp-0001-Do-not-format-man-pages.patch b/otp-0001-Do-not-format-man-pages.patch index 61e089e..5f9594f 100644 --- a/otp-0001-Do-not-format-man-pages.patch +++ b/otp-0001-Do-not-format-man-pages.patch @@ -1,7 +1,7 @@ From 80fd602b5cd9f4aaa7b6bd95e174708e27601db5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 25 Feb 2010 16:45:28 +0300 -Subject: [PATCH 1/2] Do not format man-pages +Subject: [PATCH 1/9] Do not format man-pages Signed-off-by: Peter Lemenkov --- @@ -28,5 +28,5 @@ index 83f9690..d26137d 100644 - exit 0 -- -1.6.2.5 +1.6.6.1 diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index ffc6cde..0293073 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -1,7 +1,7 @@ From 2e10f728feb56ea96b2832999a8c34f1f19646bc Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 25 Feb 2010 16:57:43 +0300 -Subject: [PATCH 2/2] Remove rpath +Subject: [PATCH 2/9] Remove rpath Signed-off-by: Peter Lemenkov --- @@ -68,5 +68,5 @@ index 49a209f..5e6c74e 100644 SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@ -- -1.6.2.5 +1.6.6.1 diff --git a/otp-0006-Fix-shared-libraries-installation.patch b/otp-0006-Fix-shared-libraries-installation.patch new file mode 100644 index 0000000..2df3cb4 --- /dev/null +++ b/otp-0006-Fix-shared-libraries-installation.patch @@ -0,0 +1,58 @@ +From 0c963550412174a4c4fe64aa7f70189998abef41 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 15 Apr 2010 13:31:36 +0400 +Subject: [PATCH 6/9] Fix shared libraries installation + +Several shared libraries (asn1_erl_drv.so, megaco_flex_scanner_drv_mt.so, +megaco_flex_scanner_drv.so, wxe_driver.so) were installed as data files +previously. + +Signed-off-by: Peter Lemenkov +--- + lib/asn1/c_src/Makefile | 2 +- + lib/megaco/src/flex/Makefile.in | 2 +- + lib/wx/c_src/Makefile.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile +index 906c513..9e9cb18 100644 +--- a/lib/asn1/c_src/Makefile ++++ b/lib/asn1/c_src/Makefile +@@ -124,7 +124,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/lib +- $(INSTALL_DATA) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib + $(INSTALL_DIR) $(RELSYSDIR)/c_src + $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src + +diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in +index 6ce9b34..5af651d 100644 +--- a/lib/megaco/src/flex/Makefile.in ++++ b/lib/megaco/src/flex/Makefile.in +@@ -280,7 +280,7 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) + $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex +- $(INSTALL_DATA) $(SOLIBS) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib + endif + + +diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in +index 5a0b4ce..8710641 100644 +--- a/lib/wx/c_src/Makefile.in ++++ b/lib/wx/c_src/Makefile.in +@@ -167,7 +167,7 @@ release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/$(SYS_TYPE) + $(INSTALL_DATA) ../priv/erlang-logo32.png $(RELSYSDIR)/priv/ + $(INSTALL_DATA) ../priv/erlang-logo64.png $(RELSYSDIR)/priv/ +- $(INSTALL_DATA) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) ++ $(INSTALL_PROGRAM) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) + + release_docs_spec: + +-- +1.6.6.1 + diff --git a/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch b/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch new file mode 100644 index 0000000..5e78c4a --- /dev/null +++ b/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch @@ -0,0 +1,35 @@ +From 6ffccff36e0d94cba0412cf3a29769b4a19d3be3 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Fri, 16 Apr 2010 21:13:47 +0400 +Subject: [PATCH 7/9] Fix for dlopening libGL and libGLU + +Signed-off-by: Peter Lemenkov +--- + lib/wx/c_src/wxe_gl.cpp | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp +index 63dd68f..36bf15f 100644 +--- a/lib/wx/c_src/wxe_gl.cpp ++++ b/lib/wx/c_src/wxe_gl.cpp +@@ -81,7 +81,7 @@ int initOpenGL() + WCHAR * DLName = wxT("opengl32.dll"); + HMODULE LIBhandle = LoadLibrary(DLName); + #else +- char * DLName = (char *) "libGL.so"; ++ char * DLName = (char *) "libGL.so.1"; + void * LIBhandle = dlopen(DLName, RTLD_LAZY); + #endif + // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); +@@ -132,7 +132,7 @@ int initOpenGL() + DLName = wxT("glu32.dll"); + LIBhandle = LoadLibrary(DLName); + #else +- DLName = (char *) "libGLU.so"; ++ DLName = (char *) "libGLU.so.1"; + LIBhandle = dlopen(DLName, RTLD_LAZY); + #endif + // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); +-- +1.6.6.1 + diff --git a/otp-0008-Fix-check-for-compile-workspace-overflow.patch b/otp-0008-Fix-check-for-compile-workspace-overflow.patch new file mode 100644 index 0000000..2e34451 --- /dev/null +++ b/otp-0008-Fix-check-for-compile-workspace-overflow.patch @@ -0,0 +1,55 @@ +From d496ce48940411976617b66a5c941c78313cb78c Mon Sep 17 00:00:00 2001 +From: Michael Santos +Date: Thu, 18 Mar 2010 20:08:10 -0400 +Subject: [PATCH 8/9] Fix check for compile workspace overflow + +Patch from: +http://vcs.pcre.org/viewvc/code/trunk/pcre_compile.c?r1=504&r2=505&view=patch + +Test case: +N = 819, re:compile([lists:duplicate(N, $(), lists:duplicate(N, $))]). + +Compiling large regular expressions could overflow the workspace +buffer. Modify the test to check for a value smaller than the buffer +size. +--- + erts/emulator/pcre/pcre_compile.c | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c +index 2974336..9508c5a 100644 +--- a/erts/emulator/pcre/pcre_compile.c ++++ b/erts/emulator/pcre/pcre_compile.c +@@ -92,6 +92,11 @@ is 4 there is plenty of room. */ + + #define COMPILE_WORK_SIZE (4096) + ++/* The overrun tests check for a slightly smaller size so that they detect the ++overrun before it actually does run off the end of the data block. */ ++ ++#define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100) ++ + + /* Table for handling escaped characters in the range '0'-'z'. Positive returns + are simple data values; negative values are for special things like \d and so +@@ -2445,7 +2450,7 @@ for (;; ptr++) + #ifdef DEBUG + if (code > cd->hwm) cd->hwm = code; /* High water info */ + #endif +- if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */ ++ if (code > cd->start_workspace + WORK_SIZE_CHECK) /* Check for overrun */ + { + *errorcodeptr = ERR52; + goto FAILED; +@@ -2494,7 +2499,7 @@ for (;; ptr++) + /* In the real compile phase, just check the workspace used by the forward + reference list. */ + +- else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE) ++ else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK) + { + *errorcodeptr = ERR52; + goto FAILED; +-- +1.6.6.1 + -- cgit From d45236d9a842be3c0aad4130bdd58a11f38611cd Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 17 Apr 2010 17:05:52 +0000 Subject: Fix few minor outstanding issues before splitting into pieces --- erlang.spec | 33 ++++++++---- import.log | 1 + otp-0001-Do-not-format-man-pages.patch | 4 +- otp-0002-Remove-rpath.patch | 4 +- otp-0006-Fix-shared-libraries-installation.patch | 58 ++++++++++++++++++++++ otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch | 35 +++++++++++++ ...-Fix-check-for-compile-workspace-overflow.patch | 55 ++++++++++++++++++++ 7 files changed, 175 insertions(+), 15 deletions(-) create mode 100644 otp-0006-Fix-shared-libraries-installation.patch create mode 100644 otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch create mode 100644 otp-0008-Fix-check-for-compile-workspace-overflow.patch diff --git a/erlang.spec b/erlang.spec index d157cfb..eb436fa 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.3%{?dist} +Release: %{rel}.4%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -19,8 +19,16 @@ Source6: erlang-find-requires.sh Source7: macros.erlang # TODO this patch needs rebase against current tree Patch0: otp-links.patch +# Fedora-specific Patch1: otp-0001-Do-not-format-man-pages.patch +# Fedora-specific Patch2: otp-0002-Remove-rpath.patch +# Upstreamed +Patch6: otp-0006-Fix-shared-libraries-installation.patch +# Fedora-specific +Patch7: otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch +# Upstreamed +Patch8: otp-0008-Fix-check-for-compile-workspace-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -36,6 +44,9 @@ BuildRequires: m4 BuildRequires: fop Requires: tk +Requires: mesa-libGL +Requires: mesa-libGLU + %description Erlang is a general-purpose programming language and runtime @@ -47,6 +58,8 @@ systems from Ericsson. %package doc Summary: Erlang documentation Group: Development/Languages +BuildArch: noarch +Obsoletes: %{name}-doc < R13B-04.4 %description doc Documentation for Erlang. @@ -56,6 +69,9 @@ Documentation for Erlang. %setup -q -n otp_src_%{ver}%{rel} %patch1 -p1 -b .do_not_format_manpages %patch2 -p1 -b .rpath +%patch6 -p1 -b .fix_shared_lib_install +%patch7 -p1 -b .dlopen_opengl_libs +%patch8 -p1 -b .pcre_overflow # remove shipped zlib sources rm -f erts/emulator/zlib/*.[ch] @@ -128,16 +144,6 @@ rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/lib/odbc-*/priv/obj rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/priv/obj rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/misc -# fix permissions for asn1 library -chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/priv/lib/asn1_erl_drv.so - -# fix permissions for megaco library -chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/megaco-*/priv/lib/megaco_flex_scanner_drv.so -chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/megaco-*/priv/lib/megaco_flex_scanner_drv_mt.so - -# fix permissons for wx library -chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/wx-*/priv/*/wxe_driver.so - # 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 @@ -174,6 +180,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Apr 17 2010 Peter Lemenkov - R13B-04.4 +- Added missing Requires mesa-libGL{U} for wx module (rhbz #583287) +- Fix for buffer overflow in pcre module (rhbz #583288) +- Doc sub-package marked as noarch (partially resolves rhbz #491165) + * Fri Mar 26 2010 Peter Lemenkov - R13B-04.3 - Added rpm-related stuff for auto-generating erlang dependencies in the future builds - Since now *.yrl files are removed too. diff --git a/import.log b/import.log index 5537ce7..1ad99e1 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ erlang-R13B-04_1_fc12:F-12:erlang-R13B-04.1.fc12.src.rpm:1268837646 erlang-R13B-04_2_fc12:F-12:erlang-R13B-04.2.fc12.src.rpm:1269609314 erlang-R13B-04_3_fc12:F-12:erlang-R13B-04.3.fc12.src.rpm:1271239367 +erlang-R13B-04_4_fc12:F-12:erlang-R13B-04.4.fc12.src.rpm:1271523892 diff --git a/otp-0001-Do-not-format-man-pages.patch b/otp-0001-Do-not-format-man-pages.patch index 61e089e..5f9594f 100644 --- a/otp-0001-Do-not-format-man-pages.patch +++ b/otp-0001-Do-not-format-man-pages.patch @@ -1,7 +1,7 @@ From 80fd602b5cd9f4aaa7b6bd95e174708e27601db5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 25 Feb 2010 16:45:28 +0300 -Subject: [PATCH 1/2] Do not format man-pages +Subject: [PATCH 1/9] Do not format man-pages Signed-off-by: Peter Lemenkov --- @@ -28,5 +28,5 @@ index 83f9690..d26137d 100644 - exit 0 -- -1.6.2.5 +1.6.6.1 diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index ffc6cde..0293073 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -1,7 +1,7 @@ From 2e10f728feb56ea96b2832999a8c34f1f19646bc Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 25 Feb 2010 16:57:43 +0300 -Subject: [PATCH 2/2] Remove rpath +Subject: [PATCH 2/9] Remove rpath Signed-off-by: Peter Lemenkov --- @@ -68,5 +68,5 @@ index 49a209f..5e6c74e 100644 SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@ -- -1.6.2.5 +1.6.6.1 diff --git a/otp-0006-Fix-shared-libraries-installation.patch b/otp-0006-Fix-shared-libraries-installation.patch new file mode 100644 index 0000000..2df3cb4 --- /dev/null +++ b/otp-0006-Fix-shared-libraries-installation.patch @@ -0,0 +1,58 @@ +From 0c963550412174a4c4fe64aa7f70189998abef41 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 15 Apr 2010 13:31:36 +0400 +Subject: [PATCH 6/9] Fix shared libraries installation + +Several shared libraries (asn1_erl_drv.so, megaco_flex_scanner_drv_mt.so, +megaco_flex_scanner_drv.so, wxe_driver.so) were installed as data files +previously. + +Signed-off-by: Peter Lemenkov +--- + lib/asn1/c_src/Makefile | 2 +- + lib/megaco/src/flex/Makefile.in | 2 +- + lib/wx/c_src/Makefile.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile +index 906c513..9e9cb18 100644 +--- a/lib/asn1/c_src/Makefile ++++ b/lib/asn1/c_src/Makefile +@@ -124,7 +124,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/lib +- $(INSTALL_DATA) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib + $(INSTALL_DIR) $(RELSYSDIR)/c_src + $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src + +diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in +index 6ce9b34..5af651d 100644 +--- a/lib/megaco/src/flex/Makefile.in ++++ b/lib/megaco/src/flex/Makefile.in +@@ -280,7 +280,7 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) + $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex +- $(INSTALL_DATA) $(SOLIBS) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib + endif + + +diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in +index 5a0b4ce..8710641 100644 +--- a/lib/wx/c_src/Makefile.in ++++ b/lib/wx/c_src/Makefile.in +@@ -167,7 +167,7 @@ release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/$(SYS_TYPE) + $(INSTALL_DATA) ../priv/erlang-logo32.png $(RELSYSDIR)/priv/ + $(INSTALL_DATA) ../priv/erlang-logo64.png $(RELSYSDIR)/priv/ +- $(INSTALL_DATA) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) ++ $(INSTALL_PROGRAM) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) + + release_docs_spec: + +-- +1.6.6.1 + diff --git a/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch b/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch new file mode 100644 index 0000000..5e78c4a --- /dev/null +++ b/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch @@ -0,0 +1,35 @@ +From 6ffccff36e0d94cba0412cf3a29769b4a19d3be3 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Fri, 16 Apr 2010 21:13:47 +0400 +Subject: [PATCH 7/9] Fix for dlopening libGL and libGLU + +Signed-off-by: Peter Lemenkov +--- + lib/wx/c_src/wxe_gl.cpp | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp +index 63dd68f..36bf15f 100644 +--- a/lib/wx/c_src/wxe_gl.cpp ++++ b/lib/wx/c_src/wxe_gl.cpp +@@ -81,7 +81,7 @@ int initOpenGL() + WCHAR * DLName = wxT("opengl32.dll"); + HMODULE LIBhandle = LoadLibrary(DLName); + #else +- char * DLName = (char *) "libGL.so"; ++ char * DLName = (char *) "libGL.so.1"; + void * LIBhandle = dlopen(DLName, RTLD_LAZY); + #endif + // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); +@@ -132,7 +132,7 @@ int initOpenGL() + DLName = wxT("glu32.dll"); + LIBhandle = LoadLibrary(DLName); + #else +- DLName = (char *) "libGLU.so"; ++ DLName = (char *) "libGLU.so.1"; + LIBhandle = dlopen(DLName, RTLD_LAZY); + #endif + // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); +-- +1.6.6.1 + diff --git a/otp-0008-Fix-check-for-compile-workspace-overflow.patch b/otp-0008-Fix-check-for-compile-workspace-overflow.patch new file mode 100644 index 0000000..2e34451 --- /dev/null +++ b/otp-0008-Fix-check-for-compile-workspace-overflow.patch @@ -0,0 +1,55 @@ +From d496ce48940411976617b66a5c941c78313cb78c Mon Sep 17 00:00:00 2001 +From: Michael Santos +Date: Thu, 18 Mar 2010 20:08:10 -0400 +Subject: [PATCH 8/9] Fix check for compile workspace overflow + +Patch from: +http://vcs.pcre.org/viewvc/code/trunk/pcre_compile.c?r1=504&r2=505&view=patch + +Test case: +N = 819, re:compile([lists:duplicate(N, $(), lists:duplicate(N, $))]). + +Compiling large regular expressions could overflow the workspace +buffer. Modify the test to check for a value smaller than the buffer +size. +--- + erts/emulator/pcre/pcre_compile.c | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c +index 2974336..9508c5a 100644 +--- a/erts/emulator/pcre/pcre_compile.c ++++ b/erts/emulator/pcre/pcre_compile.c +@@ -92,6 +92,11 @@ is 4 there is plenty of room. */ + + #define COMPILE_WORK_SIZE (4096) + ++/* The overrun tests check for a slightly smaller size so that they detect the ++overrun before it actually does run off the end of the data block. */ ++ ++#define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100) ++ + + /* Table for handling escaped characters in the range '0'-'z'. Positive returns + are simple data values; negative values are for special things like \d and so +@@ -2445,7 +2450,7 @@ for (;; ptr++) + #ifdef DEBUG + if (code > cd->hwm) cd->hwm = code; /* High water info */ + #endif +- if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */ ++ if (code > cd->start_workspace + WORK_SIZE_CHECK) /* Check for overrun */ + { + *errorcodeptr = ERR52; + goto FAILED; +@@ -2494,7 +2499,7 @@ for (;; ptr++) + /* In the real compile phase, just check the workspace used by the forward + reference list. */ + +- else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE) ++ else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK) + { + *errorcodeptr = ERR52; + goto FAILED; +-- +1.6.6.1 + -- cgit From 09a92932b38e3c36a9251d475e1b0b27ba019d42 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 19 Apr 2010 11:04:24 +0000 Subject: Backported fix for overflow in PCRE and several minor fixes --- .cvsignore | 2 +- erlang.spec | 45 ++++++++++----- import.log | 1 + ...Do-not-create-links-instead-of-real-files.patch | 27 +++++++++ otp-R12B-5-0002-Fix-symlinking-of-epmd.patch | 25 +++++++++ otp-R12B-5-0003-Do-not-format-man-pages.patch | 34 +++++++++++ otp-R12B-5-0004-Remove-rpath.patch | 65 ++++++++++++++++++++++ ...-5-0005-Fix-missing-ssl-libraries-in-EPEL.patch | 25 +++++++++ ...-5-0006-Fix-shared-libraries-installation.patch | 41 ++++++++++++++ ...-Fix-check-for-compile-workspace-overflow.patch | 55 ++++++++++++++++++ otp-install.patch | 29 ---------- otp-links.patch | 13 ----- otp-null.patch | 11 ---- otp-rpath.patch | 48 ---------------- otp-sslrpath.patch | 24 -------- sources | 2 +- 16 files changed, 306 insertions(+), 141 deletions(-) create mode 100644 import.log create mode 100644 otp-R12B-5-0001-Do-not-create-links-instead-of-real-files.patch create mode 100644 otp-R12B-5-0002-Fix-symlinking-of-epmd.patch create mode 100644 otp-R12B-5-0003-Do-not-format-man-pages.patch create mode 100644 otp-R12B-5-0004-Remove-rpath.patch create mode 100644 otp-R12B-5-0005-Fix-missing-ssl-libraries-in-EPEL.patch create mode 100644 otp-R12B-5-0006-Fix-shared-libraries-installation.patch create mode 100644 otp-R12B-5-0007-Fix-check-for-compile-workspace-overflow.patch delete mode 100644 otp-install.patch delete mode 100644 otp-links.patch delete mode 100644 otp-null.patch delete mode 100644 otp-rpath.patch delete mode 100644 otp-sslrpath.patch diff --git a/.cvsignore b/.cvsignore index d16b9d5..34a6285 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_src_R12B-5.tar.gz otp_doc_html_R12B-5.tar.gz otp_doc_man_R12B-5.tar.gz +otp_src_R12B-5.tar.gz diff --git a/erlang.spec b/erlang.spec index 4e37e51..5e775da 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.7%{?dist} +Release: %{rel}.8%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -12,10 +12,13 @@ URL: http://www.erlang.org Source: http://www.erlang.org/download/otp_src_%{ver}-%{rel}.tar.gz Source1: http://www.erlang.org/download/otp_doc_html_%{ver}-%{rel}.tar.gz Source2: http://www.erlang.org/download/otp_doc_man_%{ver}-%{rel}.tar.gz -Patch0: otp-links.patch -Patch1: otp-install.patch -Patch2: otp-rpath.patch -Patch3: otp-sslrpath.patch +Patch1: otp-R12B-5-0001-Do-not-create-links-instead-of-real-files.patch +Patch2: otp-R12B-5-0002-Fix-symlinking-of-epmd.patch +Patch3: otp-R12B-5-0003-Do-not-format-man-pages.patch +Patch4: otp-R12B-5-0004-Remove-rpath.patch +Patch5: otp-R12B-5-0005-Fix-missing-ssl-libraries-in-EPEL.patch +Patch6: otp-R12B-5-0006-Fix-shared-libraries-installation.patch +Patch7: otp-R12B-5-0007-Fix-check-for-compile-workspace-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -24,13 +27,17 @@ BuildRequires: unixODBC-devel BuildRequires: tcl-devel BuildRequires: tk-devel BuildRequires: gd-devel +%if 0%{?rhel} +BuildRequires: java-1.4.2-gcj-compat-devel +%else BuildRequires: java-1.5.0-gcj-devel +%endif BuildRequires: flex BuildRequires: m4 Requires: tk -%description +%description Erlang is a general-purpose programming language and runtime environment. Erlang has built-in support for concurrency, distribution and fault tolerance. Erlang is used in several large telecommunication @@ -47,10 +54,14 @@ Documentation for Erlang. %prep %setup -q -n otp_src_%{ver}-%{rel} -%patch0 -p1 -b .links -%patch1 -p1 -b .install -%patch2 -p1 -b .rpath -#%patch3 -p1 -b .sslrpath +%patch1 -p1 -b .links +%patch2 -p1 -b .fyx_epmd_symlink +%patch3 -p1 -b .manpages +%patch4 -p1 -b .rpath_removal +%patch5 -p1 -b .missing_ssl_libraries +%patch6 -p1 -b .so_lib_install_fix +%patch7 -p1 -b .pcre_buffer_overflow + # enable dynamic linking for ssl sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure @@ -62,12 +73,13 @@ sed -i 's|@RX_LD@|gcc -shared|' lib/common_test/c_src/Makefile.in sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in - %build +# WARN: --enable-dynamic-ssl-lib needed for preventing strange messages about missing dependencies on EPEL +# see https://bugzilla.redhat.com/458646 and https://bugzilla.redhat.com/499525 %ifarch sparcv9 sparc64 -CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-dynamic-ssl-lib %else -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-dynamic-ssl-lib %endif chmod -R u+w . make @@ -106,7 +118,7 @@ sed -i "s|$RPM_BUILD_ROOT||" erts*/bin/{erl,start} releases/RELEASES bin/{erl,st rm -rf $RPM_BUILD_ROOT -%files +%files %defattr(-,root,root) %doc AUTHORS EPLICENCE README %{_bindir}/* @@ -123,6 +135,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 19 2010 Peter Lemenkov - R12B-5.8 +- Patches rebased +- Added patches 6,7 from trunk +- Use %%configure + * Tue Apr 21 2009 Debarshi Ray R12B-5.7 - Updated rpath patch. - Fixed configure to respect $RPM_OPT_FLAGS. diff --git a/import.log b/import.log new file mode 100644 index 0000000..37d6628 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +erlang-R12B-5_8_fc12:F-11:erlang-R12B-5.8.fc12.src.rpm:1271674987 diff --git a/otp-R12B-5-0001-Do-not-create-links-instead-of-real-files.patch b/otp-R12B-5-0001-Do-not-create-links-instead-of-real-files.patch new file mode 100644 index 0000000..8ba26f2 --- /dev/null +++ b/otp-R12B-5-0001-Do-not-create-links-instead-of-real-files.patch @@ -0,0 +1,27 @@ +From c99976fbfdef713f66b8235b8b5346b51efc7b76 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:31:43 +0400 +Subject: [PATCH 1/7] Do not create links instead of real files + +--- + Makefile.in | 4 ---- + 1 files changed, 0 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index e65bfc5..fb1f90d 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -675,10 +675,6 @@ install.Install: + # Install erlang base public files + # + install.bin: +- for file in $(ERL_BASE_PUB_FILES); do \ +- rm -f $(BINDIR)/$$file; \ +- ${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \ +- done + + # + # Directories needed before we can install +-- +1.6.6.1 + diff --git a/otp-R12B-5-0002-Fix-symlinking-of-epmd.patch b/otp-R12B-5-0002-Fix-symlinking-of-epmd.patch new file mode 100644 index 0000000..131fde1 --- /dev/null +++ b/otp-R12B-5-0002-Fix-symlinking-of-epmd.patch @@ -0,0 +1,25 @@ +From 27c1838e985581f07972c6d069f9b682ec9e07b5 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:33:50 +0400 +Subject: [PATCH 2/7] Fix symlinking of epmd + +--- + erts/etc/unix/Install.src | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src +index 6568766..a6acfeb 100644 +--- a/erts/etc/unix/Install.src ++++ b/erts/etc/unix/Install.src +@@ -87,7 +87,7 @@ if [ -h epmd ]; then + /bin/rm -f epmd + fi + +-ln -s $ERL_ROOT/erts-%I_VSN%/bin/epmd epmd ++ln -s ../erts-%I_VSN%/bin/epmd epmd + + cp -p $ERL_ROOT/erts-%I_VSN%/bin/run_erl . + cp -p $ERL_ROOT/erts-%I_VSN%/bin/to_erl . +-- +1.6.6.1 + diff --git a/otp-R12B-5-0003-Do-not-format-man-pages.patch b/otp-R12B-5-0003-Do-not-format-man-pages.patch new file mode 100644 index 0000000..1d59d46 --- /dev/null +++ b/otp-R12B-5-0003-Do-not-format-man-pages.patch @@ -0,0 +1,34 @@ +From 5e704c7ad11d10904d136c5687b045f4f9ac8c96 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:35:14 +0400 +Subject: [PATCH 3/7] Do not format man-pages + +--- + erts/etc/unix/Install.src | 14 +------------- + 1 files changed, 1 insertions(+), 13 deletions(-) + +diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src +index a6acfeb..5f7caac 100644 +--- a/erts/etc/unix/Install.src ++++ b/erts/etc/unix/Install.src +@@ -136,16 +136,4 @@ if [ "X$TARGET" != "Xsunos5" -a -d $ERL_ROOT/usr/lib ]; then + (ranlib $library) > /dev/null 2>&1 + done + fi +- +- +-# +-# Fixing the man pages +-# +- +-if [ -d $ERL_ROOT/man ] +-then +- cd $ERL_ROOT +- ./misc/format_man_pages $ERL_ROOT +-fi +- +- ++exit 0 +-- +1.6.6.1 + diff --git a/otp-R12B-5-0004-Remove-rpath.patch b/otp-R12B-5-0004-Remove-rpath.patch new file mode 100644 index 0000000..0c7043b --- /dev/null +++ b/otp-R12B-5-0004-Remove-rpath.patch @@ -0,0 +1,65 @@ +From 03e261ee3152f3c45b23886e143c28bf2953f78d Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:36:36 +0400 +Subject: [PATCH 4/7] Remove rpath + +--- + lib/crypto/c_src/Makefile.in | 2 +- + lib/crypto/priv/Makefile | 2 +- + lib/ssl/c_src/Makefile.in | 6 +++--- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in +index fb9ebae..eddcd0a 100644 +--- a/lib/crypto/c_src/Makefile.in ++++ b/lib/crypto/c_src/Makefile.in +@@ -80,7 +80,7 @@ ifeq ($(HOST_OS),) + HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) + endif + DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ +-LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ ++LD_R_FLAG= + ifeq ($(strip $(LD_R_FLAG)),) + LD_R_OPT = + else +diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile +index b8acdac..2c2989a 100644 +--- a/lib/crypto/priv/Makefile ++++ b/lib/crypto/priv/Makefile +@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o + # ---------------------------------------------------- + + $(SO_DRIVER): $(OBJS) +- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ ++ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ + -o $@ $^ -lcrypto + + $(DLL_DRIVER): $(OBJS) +diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in +index 57b2929..6fc1140 100644 +--- a/lib/ssl/c_src/Makefile.in ++++ b/lib/ssl/c_src/Makefile.in +@@ -104,7 +104,7 @@ else + SSL_MAKEFILE = + endif + +-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ ++CC_R_FLAG= + ifeq ($(findstring @,$(CC_R_FLAG)),@) + # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; + # we try our best here instead... +@@ -113,9 +113,9 @@ ifeq ($(findstring darwin,$(TARGET)),darwin) # darwin: no flag + CC_R_FLAG = + else + ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, +-CC_R_FLAG = -Wl,-rpath, ++CC_R_FLAG = + else # Default: -Wl,-R +-CC_R_FLAG = -Wl,-R ++CC_R_FLAG = + endif + endif + endif +-- +1.6.6.1 + diff --git a/otp-R12B-5-0005-Fix-missing-ssl-libraries-in-EPEL.patch b/otp-R12B-5-0005-Fix-missing-ssl-libraries-in-EPEL.patch new file mode 100644 index 0000000..9ae1e61 --- /dev/null +++ b/otp-R12B-5-0005-Fix-missing-ssl-libraries-in-EPEL.patch @@ -0,0 +1,25 @@ +From eb824c996de021797b6a4dcce233e5ddb54b8059 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:39:17 +0400 +Subject: [PATCH 5/7] Fix missing ssl-libraries in EPEL + +--- + lib/ssl/c_src/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in +index 6fc1140..9bdc2ad 100644 +--- a/lib/ssl/c_src/Makefile.in ++++ b/lib/ssl/c_src/Makefile.in +@@ -40,7 +40,7 @@ VSN=$(SSL_VSN) + CC = @CC@ + LD = @LD@ + SHELL = /bin/sh +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lkeyutils -lselinux + PLAIN_CFLAGS = @CFLAGS@ + + # ---------------------------------------------------- +-- +1.6.6.1 + diff --git a/otp-R12B-5-0006-Fix-shared-libraries-installation.patch b/otp-R12B-5-0006-Fix-shared-libraries-installation.patch new file mode 100644 index 0000000..4db1dbf --- /dev/null +++ b/otp-R12B-5-0006-Fix-shared-libraries-installation.patch @@ -0,0 +1,41 @@ +From 43a522c155f9cdf60f741d10cee9b99402143437 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:44:40 +0400 +Subject: [PATCH 6/7] Fix shared libraries installation + +Several shared libraries (asn1_erl_drv.so, megaco_flex_scanner_drv_mt.so, +megaco_flex_scanner_drv.so) were installed as data files previously. +--- + lib/asn1/c_src/Makefile.in | 2 +- + lib/megaco/src/flex/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/asn1/c_src/Makefile.in b/lib/asn1/c_src/Makefile.in +index e1aad44..73325bb 100644 +--- a/lib/asn1/c_src/Makefile.in ++++ b/lib/asn1/c_src/Makefile.in +@@ -131,7 +131,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/lib +- $(INSTALL_DATA) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib + $(INSTALL_DIR) $(RELSYSDIR)/c_src + $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src + +diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in +index 127f8b2..88c0876 100644 +--- a/lib/megaco/src/flex/Makefile.in ++++ b/lib/megaco/src/flex/Makefile.in +@@ -219,7 +219,7 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) + $(INSTALL_DATA) $(FLEX_FILES) $(RELSYSDIR)/src/flex +- $(INSTALL_DATA) $(SOLIBS) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib + endif + + +-- +1.6.6.1 + diff --git a/otp-R12B-5-0007-Fix-check-for-compile-workspace-overflow.patch b/otp-R12B-5-0007-Fix-check-for-compile-workspace-overflow.patch new file mode 100644 index 0000000..b6eb746 --- /dev/null +++ b/otp-R12B-5-0007-Fix-check-for-compile-workspace-overflow.patch @@ -0,0 +1,55 @@ +From 4c90a8bb06e8bed4b62e15b78b461edb0e606df5 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:45:41 +0400 +Subject: [PATCH 7/7] Fix check for compile workspace overflow + +Patch from: +http://vcs.pcre.org/viewvc/code/trunk/pcre_compile.c?r1=504&r2=505&view=patch + +Test case: +N = 819, re:compile([lists:duplicate(N, $(), lists:duplicate(N, $))]). + +Compiling large regular expressions could overflow the workspace +buffer. Modify the test to check for a value smaller than the buffer +size. +--- + erts/emulator/pcre/pcre_compile.c | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c +index 5d2be9a..08ce2b0 100644 +--- a/erts/emulator/pcre/pcre_compile.c ++++ b/erts/emulator/pcre/pcre_compile.c +@@ -91,6 +91,11 @@ is 4 there is plenty of room. */ + + #define COMPILE_WORK_SIZE (4096) + ++/* The overrun tests check for a slightly smaller size so that they detect the ++overrun before it actually does run off the end of the data block. */ ++ ++#define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100) ++ + + /* Table for handling escaped characters in the range '0'-'z'. Positive returns + are simple data values; negative values are for special things like \d and so +@@ -2444,7 +2449,7 @@ for (;; ptr++) + #ifdef DEBUG + if (code > cd->hwm) cd->hwm = code; /* High water info */ + #endif +- if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */ ++ if (code > cd->start_workspace + WORK_SIZE_CHECK) /* Check for overrun */ + { + *errorcodeptr = ERR52; + goto FAILED; +@@ -2493,7 +2498,7 @@ for (;; ptr++) + /* In the real compile phase, just check the workspace used by the forward + reference list. */ + +- else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE) ++ else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK) + { + *errorcodeptr = ERR52; + goto FAILED; +-- +1.6.6.1 + diff --git a/otp-install.patch b/otp-install.patch deleted file mode 100644 index 68066c7..0000000 --- a/otp-install.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- otp_src_R9C-0/erts/etc/unix/Install.src.install 2003-10-17 12:52:14.000000000 +0200 -+++ otp_src_R9C-0/erts/etc/unix/Install.src 2003-10-17 14:26:49.000000000 +0200 -@@ -84,7 +84,7 @@ - /bin/rm -f epmd - fi - --ln -s $ERL_ROOT/erts-%I_VSN%/bin/epmd epmd -+ln -s ../erts-%I_VSN%/bin/epmd epmd - - cp -p $ERL_ROOT/erts-%I_VSN%/bin/run_erl . - cp -p $ERL_ROOT/erts-%I_VSN%/bin/to_erl . -@@ -145,16 +145,4 @@ - (ranlib $library) > /dev/null 2>&1 - done - fi -- -- --# --# Fixing the man pages --# -- --if [ -d $ERL_ROOT/man ] --then -- cd $ERL_ROOT -- ./misc/format_man_pages $ERL_ROOT --fi -- -- -+exit 0 diff --git a/otp-links.patch b/otp-links.patch deleted file mode 100644 index 6c8b227..0000000 --- a/otp-links.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- otp_src_R11B-0/Makefile.in.links 2006-05-12 16:43:44.000000000 +0200 -+++ otp_src_R11B-0/Makefile.in 2006-05-18 20:27:56.000000000 +0200 -@@ -545,10 +545,6 @@ - # Install erlang base public files - # - install.bin: -- for file in $(ERL_BASE_PUB_FILES); do \ -- rm -f $(BINDIR)/$$file; \ -- ${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \ -- done - - # - # Directories needed before we can install diff --git a/otp-null.patch b/otp-null.patch deleted file mode 100644 index 7dcaec7..0000000 --- a/otp-null.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c.null otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c ---- otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c.null 2008-02-23 13:46:52.000000000 +0100 -+++ otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c 2008-02-23 13:47:15.000000000 +0100 -@@ -17,6 +17,7 @@ - * $Id$ - * - */ -+#include - #include "inet.h" - - #ifdef HAVE_CONFIG_H diff --git a/otp-rpath.patch b/otp-rpath.patch deleted file mode 100644 index 5b1d459..0000000 --- a/otp-rpath.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -urNp otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in otp_src_R12B-5/lib/crypto/c_src/Makefile.in ---- otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in 2009-04-21 18:38:46.000000000 +0530 -+++ otp_src_R12B-5/lib/crypto/c_src/Makefile.in 2009-04-21 18:51:34.000000000 +0530 -@@ -80,7 +80,7 @@ ifeq ($(HOST_OS),) - HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) - endif - DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ --LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ -+LD_R_FLAG= - ifeq ($(strip $(LD_R_FLAG)),) - LD_R_OPT = - else -diff -urNp otp_src_R12B-5.orig/lib/crypto/priv/Makefile otp_src_R12B-5/lib/crypto/priv/Makefile ---- otp_src_R12B-5.orig/lib/crypto/priv/Makefile 2009-04-21 18:38:46.000000000 +0530 -+++ otp_src_R12B-5/lib/crypto/priv/Makefile 2009-04-21 18:52:56.000000000 +0530 -@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o - # ---------------------------------------------------- - - $(SO_DRIVER): $(OBJS) -- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ -+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ - -o $@ $^ -lcrypto - - $(DLL_DRIVER): $(OBJS) -diff -urNp otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in otp_src_R12B-5/lib/ssl/c_src/Makefile.in ---- otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in 2009-04-21 18:38:47.000000000 +0530 -+++ otp_src_R12B-5/lib/ssl/c_src/Makefile.in 2009-04-21 19:58:29.000000000 +0530 -@@ -104,7 +104,7 @@ else - SSL_MAKEFILE = - endif - --CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ -+CC_R_FLAG= - ifeq ($(findstring @,$(CC_R_FLAG)),@) - # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; - # we try our best here instead... -@@ -113,9 +113,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar - CC_R_FLAG = - else - ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, --CC_R_FLAG = -Wl,-rpath, -+CC_R_FLAG = - else # Default: -Wl,-R --CC_R_FLAG = -Wl,-R -+CC_R_FLAG = - endif - endif - endif diff --git a/otp-sslrpath.patch b/otp-sslrpath.patch deleted file mode 100644 index d53909a..0000000 --- a/otp-sslrpath.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in ---- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath 2008-10-26 00:00:37.000000000 +0200 -+++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-26 00:01:09.000000000 +0200 -@@ -102,7 +102,7 @@ else - SSL_MAKEFILE = - endif - --CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ -+CC_R_FLAG= - ifeq ($(findstring @,$(CC_R_FLAG)),@) - # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; - # we try our best here instead... -@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar - CC_R_FLAG = - else - ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, --CC_R_FLAG = -Wl,-rpath, -+CC_R_FLAG = - else # Default: -Wl,-R --CC_R_FLAG = -Wl,-R -+CC_R_FLAG = - endif - endif - endif diff --git a/sources b/sources index 6f16b51..0b15f23 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -3751ea3fea669d2b25c67eeb883734bb otp_src_R12B-5.tar.gz fb0c5454bbd865e881b6712295f6d41f otp_doc_html_R12B-5.tar.gz 6231cb172847040395cc34b20781aa3b otp_doc_man_R12B-5.tar.gz +3751ea3fea669d2b25c67eeb883734bb otp_src_R12B-5.tar.gz -- cgit From f69201d8f42c027f7b3ed2e7f7403a486246e41b Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 19 Apr 2010 11:06:13 +0000 Subject: Backported fix for overflow in PCRE and several minor fixes --- erlang.spec | 44 +++++++++------ import.log | 1 + ...Do-not-create-links-instead-of-real-files.patch | 27 +++++++++ otp-R12B-5-0002-Fix-symlinking-of-epmd.patch | 25 +++++++++ otp-R12B-5-0003-Do-not-format-man-pages.patch | 34 +++++++++++ otp-R12B-5-0004-Remove-rpath.patch | 65 ++++++++++++++++++++++ ...-5-0005-Fix-missing-ssl-libraries-in-EPEL.patch | 25 +++++++++ ...-5-0006-Fix-shared-libraries-installation.patch | 41 ++++++++++++++ ...-Fix-check-for-compile-workspace-overflow.patch | 55 ++++++++++++++++++ otp-install.patch | 29 ---------- otp-links.patch | 13 ----- otp-rpath.patch | 39 ------------- otp-ssl_missing_libs.patch | 11 ---- otp-sslrpath.patch | 24 -------- 14 files changed, 300 insertions(+), 133 deletions(-) create mode 100644 otp-R12B-5-0001-Do-not-create-links-instead-of-real-files.patch create mode 100644 otp-R12B-5-0002-Fix-symlinking-of-epmd.patch create mode 100644 otp-R12B-5-0003-Do-not-format-man-pages.patch create mode 100644 otp-R12B-5-0004-Remove-rpath.patch create mode 100644 otp-R12B-5-0005-Fix-missing-ssl-libraries-in-EPEL.patch create mode 100644 otp-R12B-5-0006-Fix-shared-libraries-installation.patch create mode 100644 otp-R12B-5-0007-Fix-check-for-compile-workspace-overflow.patch delete mode 100644 otp-install.patch delete mode 100644 otp-links.patch delete mode 100644 otp-rpath.patch delete mode 100644 otp-ssl_missing_libs.patch delete mode 100644 otp-sslrpath.patch diff --git a/erlang.spec b/erlang.spec index 708a1ae..5e775da 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.6%{?dist}.1 +Release: %{rel}.8%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -12,11 +12,13 @@ URL: http://www.erlang.org Source: http://www.erlang.org/download/otp_src_%{ver}-%{rel}.tar.gz Source1: http://www.erlang.org/download/otp_doc_html_%{ver}-%{rel}.tar.gz Source2: http://www.erlang.org/download/otp_doc_man_%{ver}-%{rel}.tar.gz -Patch0: otp-links.patch -Patch1: otp-install.patch -Patch2: otp-rpath.patch -Patch3: otp-sslrpath.patch -Patch6: otp-ssl_missing_libs.patch +Patch1: otp-R12B-5-0001-Do-not-create-links-instead-of-real-files.patch +Patch2: otp-R12B-5-0002-Fix-symlinking-of-epmd.patch +Patch3: otp-R12B-5-0003-Do-not-format-man-pages.patch +Patch4: otp-R12B-5-0004-Remove-rpath.patch +Patch5: otp-R12B-5-0005-Fix-missing-ssl-libraries-in-EPEL.patch +Patch6: otp-R12B-5-0006-Fix-shared-libraries-installation.patch +Patch7: otp-R12B-5-0007-Fix-check-for-compile-workspace-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -52,11 +54,14 @@ Documentation for Erlang. %prep %setup -q -n otp_src_%{ver}-%{rel} -%patch0 -p1 -b .links -%patch1 -p1 -b .install -%patch2 -p1 -b .rpath -#%patch3 -p1 -b .sslrpath -%patch6 -p0 -b .keyutils +%patch1 -p1 -b .links +%patch2 -p1 -b .fyx_epmd_symlink +%patch3 -p1 -b .manpages +%patch4 -p1 -b .rpath_removal +%patch5 -p1 -b .missing_ssl_libraries +%patch6 -p1 -b .so_lib_install_fix +%patch7 -p1 -b .pcre_buffer_overflow + # enable dynamic linking for ssl sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure @@ -68,14 +73,13 @@ sed -i 's|@RX_LD@|gcc -shared|' lib/common_test/c_src/Makefile.in sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in - %build # WARN: --enable-dynamic-ssl-lib needed for preventing strange messages about missing dependencies on EPEL -# see https://bugzilla.redhat.com/show_bug.cgi?id=458646 and https://bugzilla.redhat.com/show_bug.cgi?id=499525 +# see https://bugzilla.redhat.com/458646 and https://bugzilla.redhat.com/499525 %ifarch sparcv9 sparc64 -CFLAGS="-mcpu=ultrasparc -fno-strict-aliasing" ./configure --enable-dynamic-ssl-lib --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-dynamic-ssl-lib %else -CFLAGS="-fno-strict-aliasing" ./configure --enable-dynamic-ssl-lib --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-dynamic-ssl-lib %endif chmod -R u+w . make @@ -131,8 +135,14 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu May 7 2009 Peter Lemenkov - R12B-5.6 -- added accidentally removed --enable-dynamic-ssl-lib +* Mon Apr 19 2010 Peter Lemenkov - R12B-5.8 +- Patches rebased +- Added patches 6,7 from trunk +- Use %%configure + +* Tue Apr 21 2009 Debarshi Ray R12B-5.7 +- Updated rpath patch. +- Fixed configure to respect $RPM_OPT_FLAGS. * Sun Mar 1 2009 Gerard Milmeister - R12B-5.6 - new release R12B-5 diff --git a/import.log b/import.log index 4047428..3a20c19 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ erlang-R12B-3_2_fc9:EL-5:erlang-R12B-3.2.fc9.src.rpm:1218402033 erlang-R12B-5_6_fc10:EL-5:erlang-R12B-5.6.fc10.src.rpm:1240063042 erlang-R12B-5_6_fc10_1:EL-5:erlang-R12B-5.6.fc10.1.src.rpm:1241692887 +erlang-R12B-5_8_fc12:EL-5:erlang-R12B-5.8.fc12.src.rpm:1271675150 diff --git a/otp-R12B-5-0001-Do-not-create-links-instead-of-real-files.patch b/otp-R12B-5-0001-Do-not-create-links-instead-of-real-files.patch new file mode 100644 index 0000000..8ba26f2 --- /dev/null +++ b/otp-R12B-5-0001-Do-not-create-links-instead-of-real-files.patch @@ -0,0 +1,27 @@ +From c99976fbfdef713f66b8235b8b5346b51efc7b76 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:31:43 +0400 +Subject: [PATCH 1/7] Do not create links instead of real files + +--- + Makefile.in | 4 ---- + 1 files changed, 0 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index e65bfc5..fb1f90d 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -675,10 +675,6 @@ install.Install: + # Install erlang base public files + # + install.bin: +- for file in $(ERL_BASE_PUB_FILES); do \ +- rm -f $(BINDIR)/$$file; \ +- ${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \ +- done + + # + # Directories needed before we can install +-- +1.6.6.1 + diff --git a/otp-R12B-5-0002-Fix-symlinking-of-epmd.patch b/otp-R12B-5-0002-Fix-symlinking-of-epmd.patch new file mode 100644 index 0000000..131fde1 --- /dev/null +++ b/otp-R12B-5-0002-Fix-symlinking-of-epmd.patch @@ -0,0 +1,25 @@ +From 27c1838e985581f07972c6d069f9b682ec9e07b5 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:33:50 +0400 +Subject: [PATCH 2/7] Fix symlinking of epmd + +--- + erts/etc/unix/Install.src | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src +index 6568766..a6acfeb 100644 +--- a/erts/etc/unix/Install.src ++++ b/erts/etc/unix/Install.src +@@ -87,7 +87,7 @@ if [ -h epmd ]; then + /bin/rm -f epmd + fi + +-ln -s $ERL_ROOT/erts-%I_VSN%/bin/epmd epmd ++ln -s ../erts-%I_VSN%/bin/epmd epmd + + cp -p $ERL_ROOT/erts-%I_VSN%/bin/run_erl . + cp -p $ERL_ROOT/erts-%I_VSN%/bin/to_erl . +-- +1.6.6.1 + diff --git a/otp-R12B-5-0003-Do-not-format-man-pages.patch b/otp-R12B-5-0003-Do-not-format-man-pages.patch new file mode 100644 index 0000000..1d59d46 --- /dev/null +++ b/otp-R12B-5-0003-Do-not-format-man-pages.patch @@ -0,0 +1,34 @@ +From 5e704c7ad11d10904d136c5687b045f4f9ac8c96 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:35:14 +0400 +Subject: [PATCH 3/7] Do not format man-pages + +--- + erts/etc/unix/Install.src | 14 +------------- + 1 files changed, 1 insertions(+), 13 deletions(-) + +diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src +index a6acfeb..5f7caac 100644 +--- a/erts/etc/unix/Install.src ++++ b/erts/etc/unix/Install.src +@@ -136,16 +136,4 @@ if [ "X$TARGET" != "Xsunos5" -a -d $ERL_ROOT/usr/lib ]; then + (ranlib $library) > /dev/null 2>&1 + done + fi +- +- +-# +-# Fixing the man pages +-# +- +-if [ -d $ERL_ROOT/man ] +-then +- cd $ERL_ROOT +- ./misc/format_man_pages $ERL_ROOT +-fi +- +- ++exit 0 +-- +1.6.6.1 + diff --git a/otp-R12B-5-0004-Remove-rpath.patch b/otp-R12B-5-0004-Remove-rpath.patch new file mode 100644 index 0000000..0c7043b --- /dev/null +++ b/otp-R12B-5-0004-Remove-rpath.patch @@ -0,0 +1,65 @@ +From 03e261ee3152f3c45b23886e143c28bf2953f78d Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:36:36 +0400 +Subject: [PATCH 4/7] Remove rpath + +--- + lib/crypto/c_src/Makefile.in | 2 +- + lib/crypto/priv/Makefile | 2 +- + lib/ssl/c_src/Makefile.in | 6 +++--- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in +index fb9ebae..eddcd0a 100644 +--- a/lib/crypto/c_src/Makefile.in ++++ b/lib/crypto/c_src/Makefile.in +@@ -80,7 +80,7 @@ ifeq ($(HOST_OS),) + HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) + endif + DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ +-LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ ++LD_R_FLAG= + ifeq ($(strip $(LD_R_FLAG)),) + LD_R_OPT = + else +diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile +index b8acdac..2c2989a 100644 +--- a/lib/crypto/priv/Makefile ++++ b/lib/crypto/priv/Makefile +@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o + # ---------------------------------------------------- + + $(SO_DRIVER): $(OBJS) +- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ ++ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ + -o $@ $^ -lcrypto + + $(DLL_DRIVER): $(OBJS) +diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in +index 57b2929..6fc1140 100644 +--- a/lib/ssl/c_src/Makefile.in ++++ b/lib/ssl/c_src/Makefile.in +@@ -104,7 +104,7 @@ else + SSL_MAKEFILE = + endif + +-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ ++CC_R_FLAG= + ifeq ($(findstring @,$(CC_R_FLAG)),@) + # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; + # we try our best here instead... +@@ -113,9 +113,9 @@ ifeq ($(findstring darwin,$(TARGET)),darwin) # darwin: no flag + CC_R_FLAG = + else + ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, +-CC_R_FLAG = -Wl,-rpath, ++CC_R_FLAG = + else # Default: -Wl,-R +-CC_R_FLAG = -Wl,-R ++CC_R_FLAG = + endif + endif + endif +-- +1.6.6.1 + diff --git a/otp-R12B-5-0005-Fix-missing-ssl-libraries-in-EPEL.patch b/otp-R12B-5-0005-Fix-missing-ssl-libraries-in-EPEL.patch new file mode 100644 index 0000000..9ae1e61 --- /dev/null +++ b/otp-R12B-5-0005-Fix-missing-ssl-libraries-in-EPEL.patch @@ -0,0 +1,25 @@ +From eb824c996de021797b6a4dcce233e5ddb54b8059 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:39:17 +0400 +Subject: [PATCH 5/7] Fix missing ssl-libraries in EPEL + +--- + lib/ssl/c_src/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in +index 6fc1140..9bdc2ad 100644 +--- a/lib/ssl/c_src/Makefile.in ++++ b/lib/ssl/c_src/Makefile.in +@@ -40,7 +40,7 @@ VSN=$(SSL_VSN) + CC = @CC@ + LD = @LD@ + SHELL = /bin/sh +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lkeyutils -lselinux + PLAIN_CFLAGS = @CFLAGS@ + + # ---------------------------------------------------- +-- +1.6.6.1 + diff --git a/otp-R12B-5-0006-Fix-shared-libraries-installation.patch b/otp-R12B-5-0006-Fix-shared-libraries-installation.patch new file mode 100644 index 0000000..4db1dbf --- /dev/null +++ b/otp-R12B-5-0006-Fix-shared-libraries-installation.patch @@ -0,0 +1,41 @@ +From 43a522c155f9cdf60f741d10cee9b99402143437 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:44:40 +0400 +Subject: [PATCH 6/7] Fix shared libraries installation + +Several shared libraries (asn1_erl_drv.so, megaco_flex_scanner_drv_mt.so, +megaco_flex_scanner_drv.so) were installed as data files previously. +--- + lib/asn1/c_src/Makefile.in | 2 +- + lib/megaco/src/flex/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/asn1/c_src/Makefile.in b/lib/asn1/c_src/Makefile.in +index e1aad44..73325bb 100644 +--- a/lib/asn1/c_src/Makefile.in ++++ b/lib/asn1/c_src/Makefile.in +@@ -131,7 +131,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/lib +- $(INSTALL_DATA) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib + $(INSTALL_DIR) $(RELSYSDIR)/c_src + $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src + +diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in +index 127f8b2..88c0876 100644 +--- a/lib/megaco/src/flex/Makefile.in ++++ b/lib/megaco/src/flex/Makefile.in +@@ -219,7 +219,7 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) + $(INSTALL_DATA) $(FLEX_FILES) $(RELSYSDIR)/src/flex +- $(INSTALL_DATA) $(SOLIBS) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib + endif + + +-- +1.6.6.1 + diff --git a/otp-R12B-5-0007-Fix-check-for-compile-workspace-overflow.patch b/otp-R12B-5-0007-Fix-check-for-compile-workspace-overflow.patch new file mode 100644 index 0000000..b6eb746 --- /dev/null +++ b/otp-R12B-5-0007-Fix-check-for-compile-workspace-overflow.patch @@ -0,0 +1,55 @@ +From 4c90a8bb06e8bed4b62e15b78b461edb0e606df5 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:45:41 +0400 +Subject: [PATCH 7/7] Fix check for compile workspace overflow + +Patch from: +http://vcs.pcre.org/viewvc/code/trunk/pcre_compile.c?r1=504&r2=505&view=patch + +Test case: +N = 819, re:compile([lists:duplicate(N, $(), lists:duplicate(N, $))]). + +Compiling large regular expressions could overflow the workspace +buffer. Modify the test to check for a value smaller than the buffer +size. +--- + erts/emulator/pcre/pcre_compile.c | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c +index 5d2be9a..08ce2b0 100644 +--- a/erts/emulator/pcre/pcre_compile.c ++++ b/erts/emulator/pcre/pcre_compile.c +@@ -91,6 +91,11 @@ is 4 there is plenty of room. */ + + #define COMPILE_WORK_SIZE (4096) + ++/* The overrun tests check for a slightly smaller size so that they detect the ++overrun before it actually does run off the end of the data block. */ ++ ++#define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100) ++ + + /* Table for handling escaped characters in the range '0'-'z'. Positive returns + are simple data values; negative values are for special things like \d and so +@@ -2444,7 +2449,7 @@ for (;; ptr++) + #ifdef DEBUG + if (code > cd->hwm) cd->hwm = code; /* High water info */ + #endif +- if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */ ++ if (code > cd->start_workspace + WORK_SIZE_CHECK) /* Check for overrun */ + { + *errorcodeptr = ERR52; + goto FAILED; +@@ -2493,7 +2498,7 @@ for (;; ptr++) + /* In the real compile phase, just check the workspace used by the forward + reference list. */ + +- else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE) ++ else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK) + { + *errorcodeptr = ERR52; + goto FAILED; +-- +1.6.6.1 + diff --git a/otp-install.patch b/otp-install.patch deleted file mode 100644 index 68066c7..0000000 --- a/otp-install.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- otp_src_R9C-0/erts/etc/unix/Install.src.install 2003-10-17 12:52:14.000000000 +0200 -+++ otp_src_R9C-0/erts/etc/unix/Install.src 2003-10-17 14:26:49.000000000 +0200 -@@ -84,7 +84,7 @@ - /bin/rm -f epmd - fi - --ln -s $ERL_ROOT/erts-%I_VSN%/bin/epmd epmd -+ln -s ../erts-%I_VSN%/bin/epmd epmd - - cp -p $ERL_ROOT/erts-%I_VSN%/bin/run_erl . - cp -p $ERL_ROOT/erts-%I_VSN%/bin/to_erl . -@@ -145,16 +145,4 @@ - (ranlib $library) > /dev/null 2>&1 - done - fi -- -- --# --# Fixing the man pages --# -- --if [ -d $ERL_ROOT/man ] --then -- cd $ERL_ROOT -- ./misc/format_man_pages $ERL_ROOT --fi -- -- -+exit 0 diff --git a/otp-links.patch b/otp-links.patch deleted file mode 100644 index 6c8b227..0000000 --- a/otp-links.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- otp_src_R11B-0/Makefile.in.links 2006-05-12 16:43:44.000000000 +0200 -+++ otp_src_R11B-0/Makefile.in 2006-05-18 20:27:56.000000000 +0200 -@@ -545,10 +545,6 @@ - # Install erlang base public files - # - install.bin: -- for file in $(ERL_BASE_PUB_FILES); do \ -- rm -f $(BINDIR)/$$file; \ -- ${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \ -- done - - # - # Directories needed before we can install diff --git a/otp-rpath.patch b/otp-rpath.patch deleted file mode 100644 index 95d38d2..0000000 --- a/otp-rpath.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath otp_src_R12B-4/lib/crypto/c_src/Makefile.in ---- otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath 2008-10-25 22:20:42.000000000 +0200 -+++ otp_src_R12B-4/lib/crypto/c_src/Makefile.in 2008-10-25 22:20:59.000000000 +0200 -@@ -80,7 +80,7 @@ ifeq ($(HOST_OS),) - HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) - endif - DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ --LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ -+LD_R_FLAG= - ifeq ($(strip $(LD_R_FLAG)),) - LD_R_OPT = - else -diff -up otp_src_R12B-4/lib/crypto/priv/Makefile.rpath otp_src_R12B-4/lib/crypto/priv/Makefile ---- otp_src_R12B-4/lib/crypto/priv/Makefile.rpath 2008-10-25 22:21:11.000000000 +0200 -+++ otp_src_R12B-4/lib/crypto/priv/Makefile 2008-10-25 22:21:33.000000000 +0200 -@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o - # ---------------------------------------------------- - - $(SO_DRIVER): $(OBJS) -- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ -+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ - -o $@ $^ -lcrypto - - $(DLL_DRIVER): $(OBJS) -diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in ---- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath 2008-10-25 22:21:51.000000000 +0200 -+++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-25 22:22:21.000000000 +0200 -@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar - CC_R_FLAG = - else - ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, --CC_R_FLAG = -Wl,-rpath, -+CC_R_FLAG = - else # Default: -Wl,-R --CC_R_FLAG = -Wl,-R -+CC_R_FLAG = - endif - endif - endif diff --git a/otp-ssl_missing_libs.patch b/otp-ssl_missing_libs.patch deleted file mode 100644 index 7c36647..0000000 --- a/otp-ssl_missing_libs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/ssl/c_src/Makefile.in 2008-03-27 13:43:04.000000000 +0300 -+++ lib/ssl/c_src/Makefile.in 2008-03-27 14:03:27.000000000 +0300 -@@ -38,7 +38,7 @@ - CC = @CC@ - LD = @LD@ - SHELL = /bin/sh --LIBS = @LIBS@ -+LIBS = @LIBS@ -lkeyutils -lselinux - PLAIN_CFLAGS = @CFLAGS@ - - # ---------------------------------------------------- diff --git a/otp-sslrpath.patch b/otp-sslrpath.patch deleted file mode 100644 index d53909a..0000000 --- a/otp-sslrpath.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in ---- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath 2008-10-26 00:00:37.000000000 +0200 -+++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-26 00:01:09.000000000 +0200 -@@ -102,7 +102,7 @@ else - SSL_MAKEFILE = - endif - --CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ -+CC_R_FLAG= - ifeq ($(findstring @,$(CC_R_FLAG)),@) - # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; - # we try our best here instead... -@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar - CC_R_FLAG = - else - ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, --CC_R_FLAG = -Wl,-rpath, -+CC_R_FLAG = - else # Default: -Wl,-R --CC_R_FLAG = -Wl,-R -+CC_R_FLAG = - endif - endif - endif -- cgit From 03eee960b2d94feb7b50aec787447e58f52c89b8 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 20 Apr 2010 07:52:48 +0000 Subject: Rebased patches + fix for PCRE overflow --- .cvsignore | 6 +- erlang.spec | 97 +++------ import.log | 1 + ...Do-not-create-links-instead-of-real-files.patch | 27 +++ otp-R11B-2-0002-Fix-symlinking-of-epmd.patch | 25 +++ otp-R11B-2-0003-Do-not-format-man-pages.patch | 34 ++++ otp-R11B-2-0004-Remove-rpath.patch | 65 ++++++ ...-2-0005-Fix-shared-libraries-installation.patch | 41 ++++ ...-2-0006-Fix-missing-ssl-libraries-in-EPEL.patch | 219 +++++++++++++++++++++ otp-R11B-2-0007-Fix-for-Glibc-2.5.patch | 25 +++ otp-R11B-2-0008-Fix-for-run_erl-utility.patch | 63 ++++++ otp-install.patch | 29 --- otp-links.patch | 13 -- otp-ssl_missing_libs.patch | 11 -- otp-sslrpath.patch | 11 -- sources | 6 +- 16 files changed, 535 insertions(+), 138 deletions(-) create mode 100644 otp-R11B-2-0001-Do-not-create-links-instead-of-real-files.patch create mode 100644 otp-R11B-2-0002-Fix-symlinking-of-epmd.patch create mode 100644 otp-R11B-2-0003-Do-not-format-man-pages.patch create mode 100644 otp-R11B-2-0004-Remove-rpath.patch create mode 100644 otp-R11B-2-0005-Fix-shared-libraries-installation.patch create mode 100644 otp-R11B-2-0006-Fix-missing-ssl-libraries-in-EPEL.patch create mode 100644 otp-R11B-2-0007-Fix-for-Glibc-2.5.patch create mode 100644 otp-R11B-2-0008-Fix-for-run_erl-utility.patch delete mode 100644 otp-install.patch delete mode 100644 otp-links.patch delete mode 100644 otp-ssl_missing_libs.patch delete mode 100644 otp-sslrpath.patch diff --git a/.cvsignore b/.cvsignore index 40fd7e4..8b4c8b7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_doc_html_R12B-3.tar.gz -otp_doc_man_R12B-3.tar.gz -otp_src_R12B-3.tar.gz +otp_doc_html_R11B-2.tar.gz +otp_doc_man_R11B-2.tar.gz +otp_src_R11B-2.tar.gz diff --git a/erlang.spec b/erlang.spec index 919d51f..da3d089 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,21 +1,22 @@ -%define ver R12B -%define rel 3 - Name: erlang -Version: %{ver} -Release: %{rel}.3%{?dist} +Version: R11B +Release: 2.4%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages -License: ERPL +License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_%{ver}-%{rel}.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_%{ver}-%{rel}.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_%{ver}-%{rel}.tar.gz -Patch0: otp-links.patch -Patch1: otp-install.patch -Patch3: otp-sslrpath.patch -Patch6: otp-ssl_missing_libs.patch +Source: http://www.erlang.org/download/otp_src_R11B-2.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R11B-2.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R11B-2.tar.gz +Patch1: otp-R11B-2-0001-Do-not-create-links-instead-of-real-files.patch +Patch2: otp-R11B-2-0002-Fix-symlinking-of-epmd.patch +Patch3: otp-R11B-2-0003-Do-not-format-man-pages.patch +Patch4: otp-R11B-2-0004-Remove-rpath.patch +Patch5: otp-R11B-2-0005-Fix-shared-libraries-installation.patch +Patch6: otp-R11B-2-0006-Fix-missing-ssl-libraries-in-EPEL.patch +Patch7: otp-R11B-2-0007-Fix-for-Glibc-2.5.patch +Patch8: otp-R11B-2-0008-Fix-for-run_erl-utility.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -23,14 +24,13 @@ BuildRequires: openssl-devel BuildRequires: unixODBC-devel BuildRequires: tcl-devel BuildRequires: tk-devel -BuildRequires: gd-devel BuildRequires: java-1.4.2-gcj-compat-devel BuildRequires: flex BuildRequires: m4 Requires: tk -%description +%description Erlang is a general-purpose programming language and runtime environment. Erlang has built-in support for concurrency, distribution and fault tolerance. Erlang is used in several large telecommunication @@ -46,25 +46,19 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_%{ver}-%{rel} -%patch0 -p1 -b .links -%patch1 -p1 -b .install -%patch3 -p1 -b .sslrpath -%patch6 -p0 -b .keyutils - -# enable dynamic linking for ssl -sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure -sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile -# fix for newer glibc version -sed -i 's|__GLIBC_MINOR__ <= 7|__GLIBC_MINOR__ <= 8|' erts/emulator/hipe/hipe_x86_signal.c -# use gcc -shared instead of ld -sed -i 's|@RX_LD@|gcc -shared|' lib/common_test/c_src/Makefile.in -sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in - +%setup -q -n otp_src_R11B-2 +%patch1 -p1 -b .links +%patch2 -p1 -b .epmd +%patch3 -p1 -b .manpages +%patch4 -p1 -b .rpath +%patch5 -p1 -b .shared_libs +%patch6 -p1 -b .missing_ssl_libs +%patch7 -p1 -b .glibc25 +%patch8 -p1 -b .run_erl %build -CFLAGS="-fno-strict-aliasing" ./configure --enable-dynamic-ssl-lib --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} chmod -R u+w . make @@ -76,7 +70,6 @@ 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 @@ -88,7 +81,7 @@ tar -C $RPM_BUILD_ROOT/%{_libdir}/erlang -zxf %{SOURCE2} # make links to binaries mkdir -p $RPM_BUILD_ROOT/%{_bindir} cd $RPM_BUILD_ROOT/%{_bindir} -for file in erl erlc +for file in erl erlc do ln -sf ../%{_lib}/erlang/bin/$file . done @@ -119,41 +112,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Aug 11 2008 Peter Lemenkov - R12B-3.3 -- Force dynamic linking of crypto libs - -* Thu Jul 17 2008 Tom "spot" Callaway - R12B-3.2 -- fix license tag - -* Sun Jul 6 2008 Gerard Milmeister - R12B-3.1 -- new release R12B-3 - -* Thu Mar 27 2008 Gerard Milmeister - R12B-1.1 -- new release R12B-1 - -* Sat Feb 23 2008 Gerard Milmeister - R12B-0.3 -- disable strict aliasing optimization - -* Mon Feb 18 2008 Fedora Release Engineering - R12B-0.2 -- Autorebuild for GCC 4.3 - -* Sat Dec 8 2007 Gerard Milmeister - R12B-0.1 -- new release R12B-0 - -* Wed Dec 05 2007 Release Engineering - R11B-6 - - Rebuild for deps - -* Sun Aug 19 2007 Gerard Milmeister - R11B-5.3 -- fix some permissions - -* Sat Aug 18 2007 Gerard Milmeister - R11B-5.2 -- enable dynamic linking for ssl - -* Sat Aug 18 2007 Gerard Milmeister - R11B-5.1 -- new release R11B-5 - -* Sat Mar 24 2007 Thomas Fitzsimmons - R11B-2.4 -- Require java-1.5.0-gcj-devel for build. +* Mon Apr 19 2010 Peter Lemenkov - R11B-2.4 +- Patches rebased +- Added patches 6,7 from trunk * Sun Dec 31 2006 Gerard Milmeister - R11B-2.3 - remove buildroot from installed files diff --git a/import.log b/import.log index d674608..e57bb33 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ erlang-R12B-3_2_fc9:EL-4:erlang-R12B-3.2.fc9.src.rpm:1218402209 +erlang-R11B-2_4_fc12:EL-4:erlang-R11B-2.4.fc12.src.rpm:1271749937 diff --git a/otp-R11B-2-0001-Do-not-create-links-instead-of-real-files.patch b/otp-R11B-2-0001-Do-not-create-links-instead-of-real-files.patch new file mode 100644 index 0000000..3245efa --- /dev/null +++ b/otp-R11B-2-0001-Do-not-create-links-instead-of-real-files.patch @@ -0,0 +1,27 @@ +From ebb23b99435517871a189a73f8ba551ade6a714f Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:31:43 +0400 +Subject: [PATCH 1/8] Do not create links instead of real files + +--- + Makefile.in | 4 ---- + 1 files changed, 0 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 894ecdf..1b263b7 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -625,10 +625,6 @@ install.Install: + # Install erlang base public files + # + install.bin: +- for file in $(ERL_BASE_PUB_FILES); do \ +- rm -f $(BINDIR)/$$file; \ +- ${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \ +- done + + # + # Directories needed before we can install +-- +1.6.6.1 + diff --git a/otp-R11B-2-0002-Fix-symlinking-of-epmd.patch b/otp-R11B-2-0002-Fix-symlinking-of-epmd.patch new file mode 100644 index 0000000..ba4dd52 --- /dev/null +++ b/otp-R11B-2-0002-Fix-symlinking-of-epmd.patch @@ -0,0 +1,25 @@ +From 65af6edd93c6fd623bdfd15db4217db4df611e06 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:33:50 +0400 +Subject: [PATCH 2/8] Fix symlinking of epmd + +--- + erts/etc/unix/Install.src | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src +index 10e114f..561b210 100644 +--- a/erts/etc/unix/Install.src ++++ b/erts/etc/unix/Install.src +@@ -85,7 +85,7 @@ if [ -h epmd ]; then + /bin/rm -f epmd + fi + +-ln -s $ERL_ROOT/erts-%I_VSN%/bin/epmd epmd ++ln -s ../erts-%I_VSN%/bin/epmd epmd + + cp -p $ERL_ROOT/erts-%I_VSN%/bin/run_erl . + cp -p $ERL_ROOT/erts-%I_VSN%/bin/to_erl . +-- +1.6.6.1 + diff --git a/otp-R11B-2-0003-Do-not-format-man-pages.patch b/otp-R11B-2-0003-Do-not-format-man-pages.patch new file mode 100644 index 0000000..d80ddf0 --- /dev/null +++ b/otp-R11B-2-0003-Do-not-format-man-pages.patch @@ -0,0 +1,34 @@ +From 8a26ec8321543bce56ca49070b2001c0ca4032bf Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:35:14 +0400 +Subject: [PATCH 3/8] Do not format man-pages + +--- + erts/etc/unix/Install.src | 14 +------------- + 1 files changed, 1 insertions(+), 13 deletions(-) + +diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src +index 561b210..c03a0ca 100644 +--- a/erts/etc/unix/Install.src ++++ b/erts/etc/unix/Install.src +@@ -134,16 +134,4 @@ if [ "X$TARGET" != "Xsunos5" -a -d $ERL_ROOT/usr/lib ]; then + (ranlib $library) > /dev/null 2>&1 + done + fi +- +- +-# +-# Fixing the man pages +-# +- +-if [ -d $ERL_ROOT/man ] +-then +- cd $ERL_ROOT +- ./misc/format_man_pages $ERL_ROOT +-fi +- +- ++exit 0 +-- +1.6.6.1 + diff --git a/otp-R11B-2-0004-Remove-rpath.patch b/otp-R11B-2-0004-Remove-rpath.patch new file mode 100644 index 0000000..13cabbb --- /dev/null +++ b/otp-R11B-2-0004-Remove-rpath.patch @@ -0,0 +1,65 @@ +From 6a80d8977bd84382e33cd4988910320b541c290d Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:36:36 +0400 +Subject: [PATCH 4/8] Remove rpath + +--- + lib/crypto/c_src/Makefile.in | 2 +- + lib/crypto/priv/Makefile | 2 +- + lib/ssl/c_src/Makefile.in | 6 +++--- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in +index 70ebeb9..481277f 100644 +--- a/lib/crypto/c_src/Makefile.in ++++ b/lib/crypto/c_src/Makefile.in +@@ -79,7 +79,7 @@ endif + ifeq ($(HOST_OS),) + HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) + endif +-LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ ++LD_R_FLAG= + ifeq ($(strip $(LD_R_FLAG)),) + LD_R_OPT = + else +diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile +index b8acdac..2c2989a 100644 +--- a/lib/crypto/priv/Makefile ++++ b/lib/crypto/priv/Makefile +@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o + # ---------------------------------------------------- + + $(SO_DRIVER): $(OBJS) +- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ ++ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ + -o $@ $^ -lcrypto + + $(DLL_DRIVER): $(OBJS) +diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in +index e6bf3c0..b145aac 100644 +--- a/lib/ssl/c_src/Makefile.in ++++ b/lib/ssl/c_src/Makefile.in +@@ -95,7 +95,7 @@ SKIP_BUILDING_BINARIES := true + endif + endif + +-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ ++CC_R_FLAG= + ifeq ($(findstring @,$(CC_R_FLAG)),@) + # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; + # we try our best here instead... +@@ -104,9 +104,9 @@ ifeq ($(findstring darwin,$(TARGET)),darwin) # darwin: no flag + CC_R_FLAG = + else + ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, +-CC_R_FLAG = -Wl,-rpath, ++CC_R_FLAG = + else # Default: -Wl,-R +-CC_R_FLAG = -Wl,-R ++CC_R_FLAG = + endif + endif + +-- +1.6.6.1 + diff --git a/otp-R11B-2-0005-Fix-shared-libraries-installation.patch b/otp-R11B-2-0005-Fix-shared-libraries-installation.patch new file mode 100644 index 0000000..79ef62a --- /dev/null +++ b/otp-R11B-2-0005-Fix-shared-libraries-installation.patch @@ -0,0 +1,41 @@ +From 211a29f1404bbe3e158e32cce7965f36fe33a3c2 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:44:40 +0400 +Subject: [PATCH 5/8] Fix shared libraries installation + +Several shared libraries (asn1_erl_drv.so, megaco_flex_scanner_drv_mt.so, +megaco_flex_scanner_drv.so) were installed as data files previously. +--- + lib/asn1/c_src/Makefile.in | 2 +- + lib/megaco/src/flex/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/asn1/c_src/Makefile.in b/lib/asn1/c_src/Makefile.in +index f9555ee..7e8c9dd 100644 +--- a/lib/asn1/c_src/Makefile.in ++++ b/lib/asn1/c_src/Makefile.in +@@ -148,7 +148,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/lib +- $(INSTALL_DATA) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib + $(INSTALL_DIR) $(RELSYSDIR)/c_src + $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src + +diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in +index eb532bd..a319ada 100644 +--- a/lib/megaco/src/flex/Makefile.in ++++ b/lib/megaco/src/flex/Makefile.in +@@ -213,7 +213,7 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) + $(INSTALL_DATA) $(FLEX_FILES) $(RELSYSDIR)/src/flex +- $(INSTALL_DATA) $(SOLIBS) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib + endif + + +-- +1.6.6.1 + diff --git a/otp-R11B-2-0006-Fix-missing-ssl-libraries-in-EPEL.patch b/otp-R11B-2-0006-Fix-missing-ssl-libraries-in-EPEL.patch new file mode 100644 index 0000000..16ddb68 --- /dev/null +++ b/otp-R11B-2-0006-Fix-missing-ssl-libraries-in-EPEL.patch @@ -0,0 +1,219 @@ +From 8fbb7446060768f03912ec903992bcf57e8d6974 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:39:17 +0400 +Subject: [PATCH 6/8] Fix missing ssl-libraries in EPEL + +--- + lib/ssl/c_src/Makefile.in | 2 +- + lib/ssl/c_src/Makefile.in~ | 186 ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 187 insertions(+), 1 deletions(-) + create mode 100644 lib/ssl/c_src/Makefile.in~ + +diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in +index b145aac..20f8dc8 100644 +--- a/lib/ssl/c_src/Makefile.in ++++ b/lib/ssl/c_src/Makefile.in +@@ -38,7 +38,7 @@ VSN=$(SSL_VSN) + CC = @CC@ + LD = @LD@ + SHELL = /bin/sh +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lkeyutils -lselinux + + # ---------------------------------------------------- + # Includes and libs +diff --git a/lib/ssl/c_src/Makefile.in~ b/lib/ssl/c_src/Makefile.in~ +new file mode 100644 +index 0000000..b145aac +--- /dev/null ++++ b/lib/ssl/c_src/Makefile.in~ +@@ -0,0 +1,186 @@ ++# ``The contents of this file are subject to the Erlang Public License, ++# Version 1.1, (the "License"); you may not use this file except in ++# compliance with the License. You should have received a copy of the ++# Erlang Public License along with this software. If not, it can be ++# retrieved via the world wide web at http://www.erlang.org/. ++# ++# Software distributed under the License is distributed on an "AS IS" ++# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See ++# the License for the specific language governing rights and limitations ++# under the License. ++# ++# The Initial Developer of the Original Code is Ericsson Utvecklings AB. ++# Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings ++# AB. All Rights Reserved.'' ++# ++# $Id$ ++# ++# Makefile only for Unix and Win32/Cygwin. ++# ++ ++include $(ERL_TOP)/make/target.mk ++include $(ERL_TOP)/make/$(TARGET)/otp.mk ++# ---------------------------------------------------- ++# SSL locations and include options from configure ++# ---------------------------------------------------- ++SSL_LIBDIR = @SSL_LIBDIR@ ++SSL_INCLUDE = @SSL_INCLUDE@ ++ ++# ---------------------------------------------------- ++# Application version ++# ---------------------------------------------------- ++include ../vsn.mk ++VSN=$(SSL_VSN) ++ ++# ---------------------------------------------------- ++# Commands ++# ---------------------------------------------------- ++CC = @CC@ ++LD = @LD@ ++SHELL = /bin/sh ++LIBS = @LIBS@ ++ ++# ---------------------------------------------------- ++# Includes and libs ++# ---------------------------------------------------- ++ ++ALL_CFLAGS = @WFLAGS@ @CFLAGS@ @DEFS@ $(TYPE_FLAGS) ++TARGET = @host@ ++ ++ifeq ($(TYPE),debug) ++TYPEMARKER = .debug ++TYPE_FLAGS = -g -DDEBUG @DEBUG_FLAGS@ ++else ++TYPEMARKER = ++TYPE_FLAGS = -O2 ++endif ++ ++PRIVDIR = ../priv ++BINDIR = $(PRIVDIR)/bin/$(TARGET) ++OBJDIR = $(PRIVDIR)/obj/$(TARGET) ++ ++# ---------------------------------------------------- ++# File suffixes ++# ---------------------------------------------------- ++exe = @EXEEXT@ ++obj = .@OBJEXT@ ++ ++# ---------------------------------------------------- ++# Release directory specification ++# ---------------------------------------------------- ++RELSYSDIR = $(RELEASE_PATH)/lib/ssl-$(VSN) ++ ++# ---------------------------------------------------- ++# Common Macros ++# ---------------------------------------------------- ++OBJS = $(OBJDIR)/esock$(obj) \ ++ $(OBJDIR)/debuglog$(obj) \ ++ $(OBJDIR)/esock_poll$(obj) \ ++ $(OBJDIR)/esock_osio$(obj) \ ++ $(OBJDIR)/esock_utils$(obj) \ ++ $(OBJDIR)/esock_posix_str$(obj) \ ++ $(OBJDIR)/esock_openssl$(obj) ++ ++PORT_PROGRAM = $(BINDIR)/ssl_esock$(exe) ++ ++ifneq ($(TARGET),win32) ++SSL_MAKEFILE = $(OBJDIR)/Makefile ++SKIP_BUILDING_BINARIES := false ++else ++ifeq ($(HOST_OS),) ++HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) ++endif ++ifeq ($(findstring solaris,$(HOST_OS)),solaris) ++SKIP_BUILDING_BINARIES := true ++endif ++endif ++ ++CC_R_FLAG= ++ifeq ($(findstring @,$(CC_R_FLAG)),@) ++# Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; ++# we try our best here instead... ++ ++ifeq ($(findstring darwin,$(TARGET)),darwin) # darwin: no flag ++CC_R_FLAG = ++else ++ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, ++CC_R_FLAG = ++else # Default: -Wl,-R ++CC_R_FLAG = ++endif ++endif ++ ++endif ++ ++ifeq ($(strip $(CC_R_FLAG)),) ++CC_R_OPT = ++else ++CC_R_OPT = $(CC_R_FLAG)$(SSL_LIBDIR) ++endif ++ ++ ++# ---------------------------------------------------- ++# Targets ++# ---------------------------------------------------- ++ ++ifeq ($(SKIP_BUILDING_BINARIES), true) ++debug opt: ++else ++debug opt: $(OBJDIR) $(BINDIR) $(OBJS) $(PORT_PROGRAM) $(SSL_MAKEFILE) ++endif ++ ++$(OBJDIR): ++ -@mkdir -p $(OBJDIR) ++ ++$(BINDIR): ++ -@mkdir -p $(BINDIR) ++ ++$(OBJDIR)/esock_openssl$(obj): esock_openssl.c ++ $(CC) -c -o $@ $(ALL_CFLAGS) $(SSL_INCLUDE) $< ++ ++$(OBJDIR)/%$(obj): %.c ++ $(CC) -c -o $@ $(ALL_CFLAGS) $< ++ ++# Unix ++$(BINDIR)/ssl_esock: $(OBJS) ++ $(CC) -L$(SSL_LIBDIR) $(CC_R_OPT) -o $@ $^ \ ++ $(LIBS) -lssl -lcrypto ++ ++# Win32/Cygwin ++$(BINDIR)/ssl_esock.exe: $(OBJS) ++ $(LD) -L$(SSL_LIBDIR) -o $@ $^ -lwsock32 -llibeay32 -lssleay32 ++ ++# Unix only ++$(SSL_MAKEFILE): ++ sed -e "s;%BINDIR%;../../bin/$(TARGET);" \ ++ -e "s;%SSL_LIBDIR%;$(SSL_LIBDIR);" \ ++ -e "s;%OBJS;$(OBJS);" \ ++ -e "s;%LIBS%;$(LIBS);" ./Makefile.dist \ ++ > $(OBJDIR)/Makefile ++ ++ ++clean: ++ rm -f $(PORT_PROGRAM) $(OBJS) core *~ $(SSL_MAKEFILE) ++ ++docs: ++ ++# ---------------------------------------------------- ++# Release Target ++# ---------------------------------------------------- ++include $(ERL_TOP)/make/otp_release_targets.mk ++ ++release_spec: opt ++ $(INSTALL_DIR) $(RELSYSDIR)/priv/bin ++ $(INSTALL_DIR) $(RELSYSDIR)/priv/obj ++ $(INSTALL_DATA) $(OBJS) $(RELSYSDIR)/priv/obj ++ $(INSTALL_PROGRAM) $(PORT_PROGRAM) $(RELSYSDIR)/priv/bin ++ifneq ($(TARGET),win32) ++ sed -e "s;%BINDIR%;../bin;" \ ++ -e "s;%SSL_LIBDIR%;$(SSL_LIBDIR);" \ ++ -e "s;%OBJS;$(OBJS);" \ ++ -e "s;%LIBS%;$(LIBS);" ./Makefile.dist \ ++ > $(RELSYSDIR)/priv/obj/Makefile ++endif ++ ++release_docs_spec: ++ +-- +1.6.6.1 + diff --git a/otp-R11B-2-0007-Fix-for-Glibc-2.5.patch b/otp-R11B-2-0007-Fix-for-Glibc-2.5.patch new file mode 100644 index 0000000..f19dfdd --- /dev/null +++ b/otp-R11B-2-0007-Fix-for-Glibc-2.5.patch @@ -0,0 +1,25 @@ +From 319be0f08f4dd4df861b550bf45ee36feb0515fb Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 15:23:08 +0400 +Subject: [PATCH 7/8] Fix for Glibc 2.5 + +--- + erts/emulator/hipe/hipe_x86_signal.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/erts/emulator/hipe/hipe_x86_signal.c b/erts/emulator/hipe/hipe_x86_signal.c +index 42097ef..f37e499 100644 +--- a/erts/emulator/hipe/hipe_x86_signal.c ++++ b/erts/emulator/hipe/hipe_x86_signal.c +@@ -34,7 +34,7 @@ + #endif + #include "hipe_signal.h" + +-#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4) ++#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4 || __GLIBC_MINOR__ == 5) + /* See comment below for glibc 2.2. */ + #ifndef __USE_GNU + #define __USE_GNU /* to un-hide RTLD_NEXT */ +-- +1.6.6.1 + diff --git a/otp-R11B-2-0008-Fix-for-run_erl-utility.patch b/otp-R11B-2-0008-Fix-for-run_erl-utility.patch new file mode 100644 index 0000000..802e5da --- /dev/null +++ b/otp-R11B-2-0008-Fix-for-run_erl-utility.patch @@ -0,0 +1,63 @@ +From 82764cd53a519b552fb4f62814ca65cd77105f14 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 15:23:49 +0400 +Subject: [PATCH 8/8] Fix for run_erl utility + +--- + erts/etc/common/Makefile.in | 2 +- + erts/etc/unix/run_erl.c | 12 ++++++++++++ + 2 files changed, 13 insertions(+), 1 deletions(-) + +diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in +index d0b9a7f..18c2f8d 100644 +--- a/erts/etc/common/Makefile.in ++++ b/erts/etc/common/Makefile.in +@@ -280,7 +280,7 @@ $(BINDIR)/inet_gethost@EXEEXT@: $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) + $(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) + + $(BINDIR)/run_erl: $(OBJDIR)/run_erl.o +- $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o ++ $(LD) $(LDFLAGS) -lutil -o $@ $(OBJDIR)/run_erl.o + + $(OBJDIR)/run_erl.o: ../unix/run_erl.c + $(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c +diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c +index a39ace3..ec73a68 100644 +--- a/erts/etc/unix/run_erl.c ++++ b/erts/etc/unix/run_erl.c +@@ -42,6 +42,8 @@ + #include + #include + #include ++#include ++#include + #if !defined(NO_SYSLOG) + #include + #endif +@@ -803,6 +805,7 @@ static int create_fifo(char *name, int perm) + static int open_pty_master(char **ptyslave) + { + int mfd; ++ int sfd; + char *major, *minor; + + static char majorchars[] = "pqrstuvwxyzabcdePQRSTUVWXYZABCDE"; +@@ -818,6 +821,15 @@ static int open_pty_master(char **ptyslave) + /* http://www.xcf.berkeley.edu/~ali/K0D/UNIX/PTY/code/upty.h.html */ + + { ++ static char ttyname[] = " "; ++ if (0 == openpty(&mfd, &sfd, ttyname, NULL, NULL)) { ++ close(sfd); ++ *ptyslave = ttyname; ++ return mfd; ++ } ++ } ++ ++ { + /* New style devpts or devfs /dev/pty/{m,s}{0,1....} */ + + static char ptyname[] = "/dev/pty/mX"; +-- +1.6.6.1 + diff --git a/otp-install.patch b/otp-install.patch deleted file mode 100644 index 68066c7..0000000 --- a/otp-install.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- otp_src_R9C-0/erts/etc/unix/Install.src.install 2003-10-17 12:52:14.000000000 +0200 -+++ otp_src_R9C-0/erts/etc/unix/Install.src 2003-10-17 14:26:49.000000000 +0200 -@@ -84,7 +84,7 @@ - /bin/rm -f epmd - fi - --ln -s $ERL_ROOT/erts-%I_VSN%/bin/epmd epmd -+ln -s ../erts-%I_VSN%/bin/epmd epmd - - cp -p $ERL_ROOT/erts-%I_VSN%/bin/run_erl . - cp -p $ERL_ROOT/erts-%I_VSN%/bin/to_erl . -@@ -145,16 +145,4 @@ - (ranlib $library) > /dev/null 2>&1 - done - fi -- -- --# --# Fixing the man pages --# -- --if [ -d $ERL_ROOT/man ] --then -- cd $ERL_ROOT -- ./misc/format_man_pages $ERL_ROOT --fi -- -- -+exit 0 diff --git a/otp-links.patch b/otp-links.patch deleted file mode 100644 index 6c8b227..0000000 --- a/otp-links.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- otp_src_R11B-0/Makefile.in.links 2006-05-12 16:43:44.000000000 +0200 -+++ otp_src_R11B-0/Makefile.in 2006-05-18 20:27:56.000000000 +0200 -@@ -545,10 +545,6 @@ - # Install erlang base public files - # - install.bin: -- for file in $(ERL_BASE_PUB_FILES); do \ -- rm -f $(BINDIR)/$$file; \ -- ${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \ -- done - - # - # Directories needed before we can install diff --git a/otp-ssl_missing_libs.patch b/otp-ssl_missing_libs.patch deleted file mode 100644 index 7c36647..0000000 --- a/otp-ssl_missing_libs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/ssl/c_src/Makefile.in 2008-03-27 13:43:04.000000000 +0300 -+++ lib/ssl/c_src/Makefile.in 2008-03-27 14:03:27.000000000 +0300 -@@ -38,7 +38,7 @@ - CC = @CC@ - LD = @LD@ - SHELL = /bin/sh --LIBS = @LIBS@ -+LIBS = @LIBS@ -lkeyutils -lselinux - PLAIN_CFLAGS = @CFLAGS@ - - # ---------------------------------------------------- diff --git a/otp-sslrpath.patch b/otp-sslrpath.patch deleted file mode 100644 index 83ba120..0000000 --- a/otp-sslrpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- otp_src_R10B-9/lib/ssl/c_src/Makefile.in.sslrpath 2005-12-29 00:49:17.000000000 +0100 -+++ otp_src_R10B-9/lib/ssl/c_src/Makefile.in 2005-12-29 00:50:15.000000000 +0100 -@@ -95,7 +95,7 @@ - endif - endif - --CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ -+CC_R_FLAG= - ifeq ($(findstring @,$(CC_R_FLAG)),@) - # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; - # we try our best here instead... diff --git a/sources b/sources index c7aff56..eeb163b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -8865d406c256abbff63eaff62d2216aa otp_doc_html_R12B-3.tar.gz -13098954c9d5804bb8394fe7badb3d0d otp_doc_man_R12B-3.tar.gz -c2e7f0ad54b8fadebde2d94106608d97 otp_src_R12B-3.tar.gz +e2c45ced77ec63b9b1dd95c8f5396f7d otp_doc_html_R11B-2.tar.gz +c81023f591c1bace836de3aa874f3c2a otp_doc_man_R11B-2.tar.gz +7d7cca1d2f392a8a317cb4c0bd904726 otp_src_R11B-2.tar.gz -- cgit From 7c52786dbad8f4314fe38c092b6d8c960a872b38 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 26 Apr 2010 08:41:49 +0000 Subject: Modularization of erlang package --- erlang.spec | 959 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- import.log | 1 + 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 - 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 - 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 af5b7b5..7d5c1e8 100644 --- a/import.log +++ b/import.log @@ -2,3 +2,4 @@ erlang-R13B-04_1_fc12:F-13:erlang-R13B-04.1.fc12.src.rpm:1268646179 erlang-R13B-04_2_fc12:F-13:erlang-R13B-04.2.fc12.src.rpm:1269608961 erlang-R13B-04_3_fc12:F-13:erlang-R13B-04.3.fc12.src.rpm:1271239209 erlang-R13B-04_4_fc12:F-13:erlang-R13B-04.4.fc12.src.rpm:1271523813 +erlang-R13B-04_5_fc12:F-13:erlang-R13B-04.5.fc12.src.rpm:1272271184 -- cgit From 3be4ce2984236093441d3aa618005a580afa5856 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 26 Apr 2010 08:43:27 +0000 Subject: Modularization of erlang package --- erlang.spec | 959 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- import.log | 1 + 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 - 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 - 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 1ad99e1..1c80656 100644 --- a/import.log +++ b/import.log @@ -2,3 +2,4 @@ erlang-R13B-04_1_fc12:F-12:erlang-R13B-04.1.fc12.src.rpm:1268837646 erlang-R13B-04_2_fc12:F-12:erlang-R13B-04.2.fc12.src.rpm:1269609314 erlang-R13B-04_3_fc12:F-12:erlang-R13B-04.3.fc12.src.rpm:1271239367 erlang-R13B-04_4_fc12:F-12:erlang-R13B-04.4.fc12.src.rpm:1271523892 +erlang-R13B-04_5_fc12:F-12:erlang-R13B-04.5.fc12.src.rpm:1272271343 -- cgit From ebcf8fdce813f71829a3897194cb6d3898aacee7 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 26 Apr 2010 08:43:27 +0000 Subject: Modularization of erlang package --- erlang.spec | 959 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- import.log | 1 + 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 - 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 - 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 1ad99e1..1c80656 100644 --- a/import.log +++ b/import.log @@ -2,3 +2,4 @@ erlang-R13B-04_1_fc12:F-12:erlang-R13B-04.1.fc12.src.rpm:1268837646 erlang-R13B-04_2_fc12:F-12:erlang-R13B-04.2.fc12.src.rpm:1269609314 erlang-R13B-04_3_fc12:F-12:erlang-R13B-04.3.fc12.src.rpm:1271239367 erlang-R13B-04_4_fc12:F-12:erlang-R13B-04.4.fc12.src.rpm:1271523892 +erlang-R13B-04_5_fc12:F-12:erlang-R13B-04.5.fc12.src.rpm:1272271343 -- cgit From 53858ca171695133ec15ba13227da42069836f50 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 26 Apr 2010 17:41:55 +0000 Subject: Fix installation path for erlang-rpm-macros --- erlang-find-provides.sh | 3 ++- erlang.spec | 39 ++++++++++++++++++++++++++------------- import.log | 1 + 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/erlang-find-provides.sh b/erlang-find-provides.sh index 0592130..10cf41e 100755 --- a/erlang-find-provides.sh +++ b/erlang-find-provides.sh @@ -63,7 +63,7 @@ for f in $appfiles; do echo "erlang($app) = $ver" done -# Check for very special case - erts, by guessing by directory name +# Check for two special cases by inspecting path to ebin directory basedirs=$(echo $filelist | tr [:blank:] '\n' | grep -o -E 'erlang\/lib\/[a-zA-Z_0-9]*-[0-9.]*\/ebin' | cut -d \/ -f 3 | sort | uniq) for bd in $basedirs; do basename=`echo $bd | cut -d \- -f 1` @@ -84,6 +84,7 @@ for bd in $basedirs; do grep "bif " $BUILDDIR/erts/emulator/hipe/*.tab | awk -F "bif " '{print "erlang(" $2 ")"}' ;; "wx") + # wx module doesn't contain app-file. echo "erlang($basename) = $basever" ;; *) diff --git a/erlang.spec b/erlang.spec index c622ce4..dc4e6d2 100644 --- a/erlang.spec +++ b/erlang.spec @@ -5,7 +5,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.5%{?dist} +Release: %{rel}.6%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -81,6 +81,7 @@ Requires: erlang-percept = %{version}-%{release} Requires: erlang-pman = %{version}-%{release} Requires: erlang-public_key = %{version}-%{release} Requires: erlang-reltool = %{version}-%{release} +Requires: erlang-rpm-macros = %{version}-%{release} Requires: erlang-runtime_tools = %{version}-%{release} Requires: erlang-sasl = %{version}-%{release} Requires: erlang-snmp = %{version}-%{release} @@ -493,6 +494,14 @@ dependencies and enables interactive customization of a target system. The backend provides a batch interface for generation of customized target systems. +%package rpm-macros +Summary: Necessary macros for building Erlang +Group: Development/Languages +Obsoletes: %{name} < R13B-04.5 + +%description rpm-macros +Necessary macros for building Erlang. + %package runtime_tools Summary: A set of tools to include in a production system Group: Development/Languages @@ -666,7 +675,6 @@ chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist/c_src/ 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 @@ -726,10 +734,10 @@ 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 -install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-requires.escript -install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-requires.sh +install -D -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-provides.escript +install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-provides.sh +install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-requires.escript +install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-requires.sh install -D -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.erlang @@ -745,13 +753,6 @@ rm -rf $RPM_BUILD_ROOT %doc %{_libdir}/erlang/README %doc %{_libdir}/erlang/COPYRIGHT -# RPM stuff -%{_sysconfdir}/rpm/macros.erlang -%{_libdir}/rpm/erlang-find-provides.escript -%{_libdir}/rpm/erlang-find-provides.sh -%{_libdir}/rpm/erlang-find-requires.escript -%{_libdir}/rpm/erlang-find-requires.sh - %files appmon %defattr(-,root,root) %{_libdir}/erlang/lib/appmon-*/ @@ -982,6 +983,14 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/reltool-*/ebin %{_libdir}/erlang/lib/reltool-*/src +%files rpm-macros +%defattr(-,root,root) +%{_sysconfdir}/rpm/macros.erlang +%{_rpmconfigdir}/erlang-find-provides.escript +%{_rpmconfigdir}/erlang-find-provides.sh +%{_rpmconfigdir}/erlang-find-requires.escript +%{_rpmconfigdir}/erlang-find-requires.sh + %files runtime_tools %defattr(-,root,root) %{_libdir}/erlang/lib/runtime_tools-*/ @@ -1071,6 +1080,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 26 2010 Peter Lemenkov - R13B-04.6 +- Made erlang-rpm-macros as separate package +- Fix error while installing erlang-rpm-macros + * Wed Apr 17 2010 Peter Lemenkov - R13B-04.5 - Use erlang rpm macros for adding provides/reqires - All %%{_libdir}/erlang/lib/* items were splitted off from main package, which diff --git a/import.log b/import.log index 7d5c1e8..eed822f 100644 --- a/import.log +++ b/import.log @@ -3,3 +3,4 @@ erlang-R13B-04_2_fc12:F-13:erlang-R13B-04.2.fc12.src.rpm:1269608961 erlang-R13B-04_3_fc12:F-13:erlang-R13B-04.3.fc12.src.rpm:1271239209 erlang-R13B-04_4_fc12:F-13:erlang-R13B-04.4.fc12.src.rpm:1271523813 erlang-R13B-04_5_fc12:F-13:erlang-R13B-04.5.fc12.src.rpm:1272271184 +erlang-R13B-04_6_fc12:F-13:erlang-R13B-04.6.fc12.src.rpm:1272303676 -- cgit From 859b2ca3620ca6ac136f7a38f92527e8bdbee614 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 26 Apr 2010 17:43:10 +0000 Subject: Fix installation path for erlang-rpm-macros --- erlang-find-provides.sh | 3 ++- erlang.spec | 39 ++++++++++++++++++++++++++------------- import.log | 1 + 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/erlang-find-provides.sh b/erlang-find-provides.sh index 0592130..10cf41e 100755 --- a/erlang-find-provides.sh +++ b/erlang-find-provides.sh @@ -63,7 +63,7 @@ for f in $appfiles; do echo "erlang($app) = $ver" done -# Check for very special case - erts, by guessing by directory name +# Check for two special cases by inspecting path to ebin directory basedirs=$(echo $filelist | tr [:blank:] '\n' | grep -o -E 'erlang\/lib\/[a-zA-Z_0-9]*-[0-9.]*\/ebin' | cut -d \/ -f 3 | sort | uniq) for bd in $basedirs; do basename=`echo $bd | cut -d \- -f 1` @@ -84,6 +84,7 @@ for bd in $basedirs; do grep "bif " $BUILDDIR/erts/emulator/hipe/*.tab | awk -F "bif " '{print "erlang(" $2 ")"}' ;; "wx") + # wx module doesn't contain app-file. echo "erlang($basename) = $basever" ;; *) diff --git a/erlang.spec b/erlang.spec index c622ce4..dc4e6d2 100644 --- a/erlang.spec +++ b/erlang.spec @@ -5,7 +5,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.5%{?dist} +Release: %{rel}.6%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -81,6 +81,7 @@ Requires: erlang-percept = %{version}-%{release} Requires: erlang-pman = %{version}-%{release} Requires: erlang-public_key = %{version}-%{release} Requires: erlang-reltool = %{version}-%{release} +Requires: erlang-rpm-macros = %{version}-%{release} Requires: erlang-runtime_tools = %{version}-%{release} Requires: erlang-sasl = %{version}-%{release} Requires: erlang-snmp = %{version}-%{release} @@ -493,6 +494,14 @@ dependencies and enables interactive customization of a target system. The backend provides a batch interface for generation of customized target systems. +%package rpm-macros +Summary: Necessary macros for building Erlang +Group: Development/Languages +Obsoletes: %{name} < R13B-04.5 + +%description rpm-macros +Necessary macros for building Erlang. + %package runtime_tools Summary: A set of tools to include in a production system Group: Development/Languages @@ -666,7 +675,6 @@ chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist/c_src/ 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 @@ -726,10 +734,10 @@ 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 -install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-requires.escript -install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-requires.sh +install -D -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-provides.escript +install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-provides.sh +install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-requires.escript +install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-requires.sh install -D -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.erlang @@ -745,13 +753,6 @@ rm -rf $RPM_BUILD_ROOT %doc %{_libdir}/erlang/README %doc %{_libdir}/erlang/COPYRIGHT -# RPM stuff -%{_sysconfdir}/rpm/macros.erlang -%{_libdir}/rpm/erlang-find-provides.escript -%{_libdir}/rpm/erlang-find-provides.sh -%{_libdir}/rpm/erlang-find-requires.escript -%{_libdir}/rpm/erlang-find-requires.sh - %files appmon %defattr(-,root,root) %{_libdir}/erlang/lib/appmon-*/ @@ -982,6 +983,14 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/reltool-*/ebin %{_libdir}/erlang/lib/reltool-*/src +%files rpm-macros +%defattr(-,root,root) +%{_sysconfdir}/rpm/macros.erlang +%{_rpmconfigdir}/erlang-find-provides.escript +%{_rpmconfigdir}/erlang-find-provides.sh +%{_rpmconfigdir}/erlang-find-requires.escript +%{_rpmconfigdir}/erlang-find-requires.sh + %files runtime_tools %defattr(-,root,root) %{_libdir}/erlang/lib/runtime_tools-*/ @@ -1071,6 +1080,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 26 2010 Peter Lemenkov - R13B-04.6 +- Made erlang-rpm-macros as separate package +- Fix error while installing erlang-rpm-macros + * Wed Apr 17 2010 Peter Lemenkov - R13B-04.5 - Use erlang rpm macros for adding provides/reqires - All %%{_libdir}/erlang/lib/* items were splitted off from main package, which diff --git a/import.log b/import.log index 1c80656..97016fb 100644 --- a/import.log +++ b/import.log @@ -3,3 +3,4 @@ erlang-R13B-04_2_fc12:F-12:erlang-R13B-04.2.fc12.src.rpm:1269609314 erlang-R13B-04_3_fc12:F-12:erlang-R13B-04.3.fc12.src.rpm:1271239367 erlang-R13B-04_4_fc12:F-12:erlang-R13B-04.4.fc12.src.rpm:1271523892 erlang-R13B-04_5_fc12:F-12:erlang-R13B-04.5.fc12.src.rpm:1272271343 +erlang-R13B-04_6_fc12:F-12:erlang-R13B-04.6.fc12.src.rpm:1272303739 -- cgit From a943e713d603fb441cf7fe3f0f66fc8b7a4efa07 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 26 Apr 2010 17:43:10 +0000 Subject: Fix installation path for erlang-rpm-macros --- erlang-find-provides.sh | 3 ++- erlang.spec | 39 ++++++++++++++++++++++++++------------- import.log | 1 + 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/erlang-find-provides.sh b/erlang-find-provides.sh index 0592130..10cf41e 100755 --- a/erlang-find-provides.sh +++ b/erlang-find-provides.sh @@ -63,7 +63,7 @@ for f in $appfiles; do echo "erlang($app) = $ver" done -# Check for very special case - erts, by guessing by directory name +# Check for two special cases by inspecting path to ebin directory basedirs=$(echo $filelist | tr [:blank:] '\n' | grep -o -E 'erlang\/lib\/[a-zA-Z_0-9]*-[0-9.]*\/ebin' | cut -d \/ -f 3 | sort | uniq) for bd in $basedirs; do basename=`echo $bd | cut -d \- -f 1` @@ -84,6 +84,7 @@ for bd in $basedirs; do grep "bif " $BUILDDIR/erts/emulator/hipe/*.tab | awk -F "bif " '{print "erlang(" $2 ")"}' ;; "wx") + # wx module doesn't contain app-file. echo "erlang($basename) = $basever" ;; *) diff --git a/erlang.spec b/erlang.spec index c622ce4..dc4e6d2 100644 --- a/erlang.spec +++ b/erlang.spec @@ -5,7 +5,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.5%{?dist} +Release: %{rel}.6%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -81,6 +81,7 @@ Requires: erlang-percept = %{version}-%{release} Requires: erlang-pman = %{version}-%{release} Requires: erlang-public_key = %{version}-%{release} Requires: erlang-reltool = %{version}-%{release} +Requires: erlang-rpm-macros = %{version}-%{release} Requires: erlang-runtime_tools = %{version}-%{release} Requires: erlang-sasl = %{version}-%{release} Requires: erlang-snmp = %{version}-%{release} @@ -493,6 +494,14 @@ dependencies and enables interactive customization of a target system. The backend provides a batch interface for generation of customized target systems. +%package rpm-macros +Summary: Necessary macros for building Erlang +Group: Development/Languages +Obsoletes: %{name} < R13B-04.5 + +%description rpm-macros +Necessary macros for building Erlang. + %package runtime_tools Summary: A set of tools to include in a production system Group: Development/Languages @@ -666,7 +675,6 @@ chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist/c_src/ 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 @@ -726,10 +734,10 @@ 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 -install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-requires.escript -install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-requires.sh +install -D -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-provides.escript +install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-provides.sh +install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-requires.escript +install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-requires.sh install -D -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.erlang @@ -745,13 +753,6 @@ rm -rf $RPM_BUILD_ROOT %doc %{_libdir}/erlang/README %doc %{_libdir}/erlang/COPYRIGHT -# RPM stuff -%{_sysconfdir}/rpm/macros.erlang -%{_libdir}/rpm/erlang-find-provides.escript -%{_libdir}/rpm/erlang-find-provides.sh -%{_libdir}/rpm/erlang-find-requires.escript -%{_libdir}/rpm/erlang-find-requires.sh - %files appmon %defattr(-,root,root) %{_libdir}/erlang/lib/appmon-*/ @@ -982,6 +983,14 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/reltool-*/ebin %{_libdir}/erlang/lib/reltool-*/src +%files rpm-macros +%defattr(-,root,root) +%{_sysconfdir}/rpm/macros.erlang +%{_rpmconfigdir}/erlang-find-provides.escript +%{_rpmconfigdir}/erlang-find-provides.sh +%{_rpmconfigdir}/erlang-find-requires.escript +%{_rpmconfigdir}/erlang-find-requires.sh + %files runtime_tools %defattr(-,root,root) %{_libdir}/erlang/lib/runtime_tools-*/ @@ -1071,6 +1080,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 26 2010 Peter Lemenkov - R13B-04.6 +- Made erlang-rpm-macros as separate package +- Fix error while installing erlang-rpm-macros + * Wed Apr 17 2010 Peter Lemenkov - R13B-04.5 - Use erlang rpm macros for adding provides/reqires - All %%{_libdir}/erlang/lib/* items were splitted off from main package, which diff --git a/import.log b/import.log index 1c80656..97016fb 100644 --- a/import.log +++ b/import.log @@ -3,3 +3,4 @@ erlang-R13B-04_2_fc12:F-12:erlang-R13B-04.2.fc12.src.rpm:1269609314 erlang-R13B-04_3_fc12:F-12:erlang-R13B-04.3.fc12.src.rpm:1271239367 erlang-R13B-04_4_fc12:F-12:erlang-R13B-04.4.fc12.src.rpm:1271523892 erlang-R13B-04_5_fc12:F-12:erlang-R13B-04.5.fc12.src.rpm:1272271343 +erlang-R13B-04_6_fc12:F-12:erlang-R13B-04.6.fc12.src.rpm:1272303739 -- cgit From 281d39fac808a141c036b3ba8934cba71b8bfd77 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 29 Apr 2010 08:06:41 +0000 Subject: Added autogenerated deps, fixed install of emacs files and much more --- .cvsignore | 2 - erlang.spec | 775 +++++++++++++++++++-- import.log | 1 + otp-0001-Do-not-format-man-pages.patch | 2 +- otp-0002-Remove-rpath.patch | 2 +- otp-0004-Fix-shared-libraries-installation.patch | 58 ++ otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch | 35 + ...-Fix-check-for-compile-workspace-overflow.patch | 55 ++ otp-0006-Fix-shared-libraries-installation.patch | 58 -- otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch | 35 - otp-0007-Install-missing-emacs-files.patch | 28 + ...-Fix-check-for-compile-workspace-overflow.patch | 55 -- sources | 2 - 13 files changed, 892 insertions(+), 216 deletions(-) create mode 100644 otp-0004-Fix-shared-libraries-installation.patch create mode 100644 otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch create mode 100644 otp-0006-Fix-check-for-compile-workspace-overflow.patch delete mode 100644 otp-0006-Fix-shared-libraries-installation.patch delete mode 100644 otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch create mode 100644 otp-0007-Install-missing-emacs-files.patch delete mode 100644 otp-0008-Fix-check-for-compile-workspace-overflow.patch diff --git a/.cvsignore b/.cvsignore index 697a4fc..ae1a587 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -otp_doc_html_R13B04.tar.gz -otp_doc_man_R13B04.tar.gz otp_src_R13B04.tar.gz diff --git a/erlang.spec b/erlang.spec index dc4e6d2..c59a8ce 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,42 +3,45 @@ %define ver R13B %define rel 04 -Name: erlang -Version: %{ver} -Release: %{rel}.6%{?dist} -Summary: General-purpose programming language and runtime environment - -Group: Development/Languages -License: ERPL -URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_%{ver}%{rel}.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_%{ver}%{rel}.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_%{ver}%{rel}.tar.gz +Name: erlang +Version: %{ver} +Release: %{rel}.9%{?dist} +Summary: General-purpose programming language and runtime environment + +Group: Development/Languages +License: ERPL +URL: http://www.erlang.org +Source0: http://www.erlang.org/download/otp_src_%{ver}%{rel}.tar.gz Source3: erlang-find-provides.escript Source4: erlang-find-provides.sh Source5: erlang-find-requires.escript Source6: erlang-find-requires.sh Source7: macros.erlang # TODO this patch needs rebase against current tree -Patch0: otp-links.patch +Patch0: otp-links.patch # Fedora-specific Patch1: otp-0001-Do-not-format-man-pages.patch # Fedora-specific Patch2: otp-0002-Remove-rpath.patch # Upstreamed -Patch6: otp-0006-Fix-shared-libraries-installation.patch +Patch4: otp-0004-Fix-shared-libraries-installation.patch # Fedora-specific -Patch7: otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch +Patch5: otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch # Upstreamed -Patch8: otp-0008-Fix-check-for-compile-workspace-overflow.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch6: otp-0006-Fix-check-for-compile-workspace-overflow.patch +# Install accidentally forgotten emacs files (see rhbz #585349) (already fixed upstream) +Patch7: otp-0007-Install-missing-emacs-files.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel -BuildRequires: openssl-devel +BuildRequires: openssl-devel BuildRequires: zlib-devel -BuildRequires: flex +BuildRequires: flex BuildRequires: m4 BuildRequires: fop +BuildRequires: libxslt +# Required for erlang-rpm-macros +BuildRequires: erlang Requires: erlang-appmon = %{version}-%{release} Requires: erlang-asn1 = %{version}-%{release} @@ -50,7 +53,7 @@ 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-cosTransactions = %{version}-%{release} Requires: erlang-crypto = %{version}-%{release} Requires: erlang-debugger = %{version}-%{release} Requires: erlang-dialyzer = %{version}-%{release} @@ -194,13 +197,14 @@ Obsoletes: %{name} < R13B-04.5 %description cosTime Orber OMG Timer and TimerEvent Service. -%package cosTransaction +%package cosTransactions Summary: Orber OMG Transaction Service Group: Development/Languages Requires: %{name}-erts = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 +Obsoletes: %{name}-cosTransaction < R13B-04.7 -%description cosTransaction +%description cosTransactions Orber OMG Transaction Service. %package crypto @@ -234,6 +238,7 @@ A DIscrepany AnaLYZer for ERlang programs. Summary: Erlang documentation Group: Development/Languages BuildArch: noarch +Requires: %{name} = %{version}-%{release} Obsoletes: %{name}-doc < R13B-04.4 %description doc @@ -647,9 +652,10 @@ Provides support for XML 1.0. %setup -q -n otp_src_%{ver}%{rel} %patch1 -p1 -b .do_not_format_manpages %patch2 -p1 -b .rpath -%patch6 -p1 -b .fix_shared_lib_install -%patch7 -p1 -b .dlopen_opengl_libs -%patch8 -p1 -b .pcre_overflow +%patch4 -p1 -b .fix_shared_lib_install +%patch5 -p1 -b .dlopen_opengl_libs +%patch6 -p1 -b .pcre_overflow +%patch7 -p1 -b .missing_emacs_files # remove shipped zlib sources rm -f erts/emulator/zlib/*.[ch] @@ -661,11 +667,13 @@ CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enabl CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib %endif make +make docs %install rm -rf $RPM_BUILD_ROOT -make INSTALL_PREFIX=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT install-docs # fix 0775 permission on some directories find $RPM_BUILD_ROOT%{_libdir}/erlang -type d -perm 0775 | xargs chmod 755 @@ -676,26 +684,32 @@ chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist/src/Ma chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/Makefile chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/src/Makefile -# install additional doc files -mkdir -p erlang_doc -tar -C erlang_doc -zxf %{SOURCE1} - -# install man-pages -tar -C $RPM_BUILD_ROOT%{_libdir}/erlang -zxf %{SOURCE2} -gzip $RPM_BUILD_ROOT%{_libdir}/erlang/man/man*/* - -# make links to binaries -mkdir -p $RPM_BUILD_ROOT%{_bindir} -cd $RPM_BUILD_ROOT%{_bindir} -for file in erl erlc escript dialyzer -do - ln -sf ../%{_lib}/erlang/bin/$file . -done - -# Remove batch files intended to use on one proprietary OS. +# Relocate doc-files into the proper directory +mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib +pushd . +cd $RPM_BUILD_ROOT%{_libdir}/erlang +mv -v doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +for i in erts-* ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/$i ; done +cd $RPM_BUILD_ROOT%{_libdir}/erlang/lib +for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib/$i || true ; done +popd +cp -av AUTHORS EPLICENCE README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} + +# Win32-specific functionality 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/os_mon-*/ebin/nteventlog.beam rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/webtool-*/priv/bin/start_webtool.bat +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/erlsrv.* +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/werl.* +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/nteventlog.* +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/win32reg.* + +# VxWorks specific +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/erl_set_memory_block.* # Remove old txt files rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/etc/otpCA/index.txt.old @@ -706,6 +720,7 @@ for d in $RPM_BUILD_ROOT%{_libdir}/erlang/lib/* ; do find $d/src -type f ! -name 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 find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/*/src -type d -empty -delete +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/cosFileTransfer-*/src # remove C and Java sources rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/c_src @@ -716,14 +731,12 @@ 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 directories -rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/doc +# remove empty directory 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/hipe-*/vsn.mk +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/*-*/info +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/hipe-*/vsn.mk # No longer needed utilities for formatting man-pages rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/misc @@ -740,6 +753,8 @@ install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-req install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-requires.sh install -D -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.erlang +# remove outdated script +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/Install %clean rm -rf $RPM_BUILD_ROOT @@ -747,15 +762,18 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) - -%doc AUTHORS EPLICENCE README.md -%doc %{_libdir}/erlang/PR.template -%doc %{_libdir}/erlang/README -%doc %{_libdir}/erlang/COPYRIGHT +%dir %{_docdir}/%{name}-%{ver}-%{rel}/ +%doc %{_docdir}/%{name}-%{ver}-%{rel}/AUTHORS +%doc %{_docdir}/%{name}-%{ver}-%{rel}/COPYRIGHT +%doc %{_docdir}/%{name}-%{ver}-%{rel}/EPLICENCE +%doc %{_docdir}/%{name}-%{ver}-%{rel}/PR.template +%doc %{_docdir}/%{name}-%{ver}-%{rel}/README +%doc %{_docdir}/%{name}-%{ver}-%{rel}/README.md %files appmon %defattr(-,root,root) %{_libdir}/erlang/lib/appmon-*/ +%{_libdir}/erlang/man/man3/appmon.* %files asn1 %defattr(-,root,root) @@ -763,66 +781,167 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/asn1-*/ebin %{_libdir}/erlang/lib/asn1-*/priv %{_libdir}/erlang/lib/asn1-*/src +%{_libdir}/erlang/man/man3/asn1ct.* +%{_libdir}/erlang/man/man3/asn1rt.* %files common_test %defattr(-,root,root) %{_libdir}/erlang/lib/common_test-*/ +%{_libdir}/erlang/man/man1/run_test.* +%{_libdir}/erlang/man/man3/ct.* +%{_libdir}/erlang/man/man3/ct_cover.* +%{_libdir}/erlang/man/man3/ct_ftp.* +%{_libdir}/erlang/man/man3/ct_master.* +%{_libdir}/erlang/man/man3/ct_rpc.* +%{_libdir}/erlang/man/man3/ct_snmp.* +%{_libdir}/erlang/man/man3/ct_ssh.* +%{_libdir}/erlang/man/man3/ct_telnet.* +%{_libdir}/erlang/man/man3/unix_telnet.* +%{_libdir}/erlang/man/man6/common_test.* %files compiler %defattr(-,root,root) %{_libdir}/erlang/lib/compiler-*/ +%{_libdir}/erlang/man/man3/compile.* %files cosEvent %defattr(-,root,root) %{_libdir}/erlang/lib/cosEvent-*/ +%{_libdir}/erlang/man/man3/cosEventApp.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ConsumerAdmin.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_EventChannel.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPullConsumer.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPullSupplier.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPushConsumer.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPushSupplier.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_SupplierAdmin.* %files cosEventDomain %defattr(-,root,root) %{_libdir}/erlang/lib/cosEventDomain-*/ +%{_libdir}/erlang/man/man3/CosEventDomainAdmin.* +%{_libdir}/erlang/man/man3/CosEventDomainAdmin_EventDomain.* +%{_libdir}/erlang/man/man3/CosEventDomainAdmin_EventDomainFactory.* +%{_libdir}/erlang/man/man3/cosEventDomainApp.* %files cosFileTransfer %defattr(-,root,root) %{_libdir}/erlang/lib/cosFileTransfer-*/ +%{_libdir}/erlang/man/man3/cosFileTransferApp.* +%{_libdir}/erlang/man/man3/CosFileTransfer_Directory.* +%{_libdir}/erlang/man/man3/CosFileTransfer_File.* +%{_libdir}/erlang/man/man3/CosFileTransfer_FileIterator.* +%{_libdir}/erlang/man/man3/CosFileTransfer_FileTransferSession.* +%{_libdir}/erlang/man/man3/CosFileTransfer_VirtualFileSystem.* %files cosNotification %defattr(-,root,root) %{_libdir}/erlang/lib/cosNotification-*/ +%{_libdir}/erlang/man/man3/CosNotification.* +%{_libdir}/erlang/man/man3/CosNotification_AdminPropertiesAdmin.* +%{_libdir}/erlang/man/man3/cosNotificationApp.* +%{_libdir}/erlang/man/man3/CosNotification_QoSAdmin.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ConsumerAdmin.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_EventChannel.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_EventChannelFactory.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPullConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPullSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPushConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPushSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxySupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPullConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPullSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPushConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPushSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPullConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPullSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPushConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPushSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SupplierAdmin.* +%{_libdir}/erlang/man/man3/CosNotifyComm_NotifyPublish.* +%{_libdir}/erlang/man/man3/CosNotifyComm_NotifySubscribe.* +%{_libdir}/erlang/man/man3/CosNotifyFilter_Filter.* +%{_libdir}/erlang/man/man3/CosNotifyFilter_FilterAdmin.* +%{_libdir}/erlang/man/man3/CosNotifyFilter_FilterFactory.* +%{_libdir}/erlang/man/man3/CosNotifyFilter_MappingFilter.* %files cosProperty %defattr(-,root,root) %{_libdir}/erlang/lib/cosProperty-*/ +%{_libdir}/erlang/man/man3/cosProperty.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertiesIterator.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertyNamesIterator.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertySet.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetDef.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetDefFactory.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetFactory.* %files cosTime %defattr(-,root,root) %{_libdir}/erlang/lib/cosTime-*/ - -%files cosTransaction +%{_libdir}/erlang/man/man3/cosTime.* +%{_libdir}/erlang/man/man3/CosTimerEvent_TimerEventHandler.* +%{_libdir}/erlang/man/man3/CosTimerEvent_TimerEventService.* +%{_libdir}/erlang/man/man3/CosTime_TimeService.* +%{_libdir}/erlang/man/man3/CosTime_TIO.* +%{_libdir}/erlang/man/man3/CosTime_UTO.* + +%files cosTransactions %defattr(-,root,root) %{_libdir}/erlang/lib/cosTransactions-*/ +%{_libdir}/erlang/man/man3/cosTransactions.* +%{_libdir}/erlang/man/man3/CosTransactions_Control.* +%{_libdir}/erlang/man/man3/CosTransactions_Coordinator.* +%{_libdir}/erlang/man/man3/CosTransactions_RecoveryCoordinator.* +%{_libdir}/erlang/man/man3/CosTransactions_Resource.* +%{_libdir}/erlang/man/man3/CosTransactions_SubtransactionAwareResource.* +%{_libdir}/erlang/man/man3/CosTransactions_Terminator.* +%{_libdir}/erlang/man/man3/CosTransactions_TransactionFactory.* %files crypto %defattr(-,root,root) %{_libdir}/erlang/lib/crypto-*/ +%{_libdir}/erlang/man/man3/crypto.* +%{_libdir}/erlang/man/man6/crypto.* %files debugger %defattr(-,root,root) %{_libdir}/erlang/lib/debugger-*/ +%{_libdir}/erlang/man/man3/debugger.* +%{_libdir}/erlang/man/man3/i.* +%{_libdir}/erlang/man/man3/int.* %files dialyzer %defattr(-,root,root) %{_libdir}/erlang/lib/dialyzer-*/ +%{_libdir}/erlang/man/man3/dialyzer.* %files doc %defattr(-,root,root) -%doc erlang_doc/* +%doc %{_docdir}/%{name}-%{ver}-%{rel}/doc +%doc %{_docdir}/%{name}-%{ver}-%{rel}/erts-*/ +%doc %{_docdir}/%{name}-%{ver}-%{rel}/lib/ + %files docbuilder %defattr(-,root,root) %{_libdir}/erlang/lib/docbuilder-*/ +%{_libdir}/erlang/man/man3/docb_gen.* +%{_libdir}/erlang/man/man3/docb_transform.* +%{_libdir}/erlang/man/man3/docb_xml_check.* +%{_libdir}/erlang/man/man6/docbuilder.* %files edoc %defattr(-,root,root) %{_libdir}/erlang/lib/edoc-*/ +%{_libdir}/erlang/man/man3/edoc.* +%{_libdir}/erlang/man/man3/edoc_doclet.* +%{_libdir}/erlang/man/man3/edoc_extract.* +%{_libdir}/erlang/man/man3/edoc_layout.* +%{_libdir}/erlang/man/man3/edoc_lib.* +%{_libdir}/erlang/man/man3/edoc_run.* %files erl_docgen %defattr(-,root,root) @@ -831,19 +950,53 @@ rm -rf $RPM_BUILD_ROOT %files erl_interface %defattr(-,root,root) %{_libdir}/erlang/lib/erl_interface-*/ +%{_libdir}/erlang/man/man1/erl_call.* +%{_libdir}/erlang/man/man3/ei.* +%{_libdir}/erlang/man/man3/ei_connect.* +%{_libdir}/erlang/man/man3/erl_connect.* +%{_libdir}/erlang/man/man3/erl_error.* +%{_libdir}/erlang/man/man3/erl_eterm.* +%{_libdir}/erlang/man/man3/erl_format.* +%{_libdir}/erlang/man/man3/erl_global.* +%{_libdir}/erlang/man/man3/erl_malloc.* +%{_libdir}/erlang/man/man3/erl_marshal.* +%{_libdir}/erlang/man/man3/registry.* %files erts %defattr(-,root,root) -%dir %{_libdir}/erlang + +# TODO these directories should be packaged separately +%dir %{_libdir}/erlang/ +%dir %{_libdir}/erlang/bin/ %dir %{_libdir}/erlang/lib/ +%dir %{_libdir}/erlang/man/ +%dir %{_libdir}/erlang/man/man1/ +%dir %{_libdir}/erlang/man/man3/ +%dir %{_libdir}/erlang/man/man4/ +%dir %{_libdir}/erlang/man/man6/ +%dir %{_libdir}/erlang/man/man7/ +%dir %{_libdir}/erlang/releases/ + %{_bindir}/* %{_libdir}/erlang/bin/ %{_libdir}/erlang/erts-*/ %{_libdir}/erlang/lib/erts-*/ -%{_libdir}/erlang/man/ -%{_libdir}/erlang/releases/ +%{_libdir}/erlang/man/man1/epmd.* +%{_libdir}/erlang/man/man1/erl.* +%{_libdir}/erlang/man/man1/erlc.* +%{_libdir}/erlang/man/man1/escript.* +%{_libdir}/erlang/man/man1/run_erl.* +%{_libdir}/erlang/man/man1/start.* +%{_libdir}/erlang/man/man1/start_erl.* +%{_libdir}/erlang/man/man3/driver_entry.* +%{_libdir}/erlang/man/man3/erl_driver.* +%{_libdir}/erlang/man/man3/erl_prim_loader.* +%{_libdir}/erlang/man/man3/erlang.* +%{_libdir}/erlang/man/man3/erts_alloc.* +%{_libdir}/erlang/man/man3/init.* +%{_libdir}/erlang/man/man3/zlib.* +%{_libdir}/erlang/releases/* %{_libdir}/erlang/usr/ -%{_libdir}/erlang/Install %files et %defattr(-,root,root) @@ -851,12 +1004,18 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/et-*/ebin %{_libdir}/erlang/lib/et-*/include %{_libdir}/erlang/lib/et-*/src +%{_libdir}/erlang/man/man3/et.* +%{_libdir}/erlang/man/man3/et_collector.* +%{_libdir}/erlang/man/man3/et_selector.* +%{_libdir}/erlang/man/man3/et_viewer.* %files eunit %defattr(-,root,root) %dir %{_libdir}/erlang/lib/eunit-*/ %{_libdir}/erlang/lib/eunit-*/ebin %{_libdir}/erlang/lib/eunit-*/include +%{_libdir}/erlang/man/man3/eunit.* +%{_libdir}/erlang/man/man3/eunit_surefire.* %files examples %defattr(-,root,root) @@ -885,6 +1044,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/gs-*/ebin %{_libdir}/erlang/lib/gs-*/priv %{_libdir}/erlang/lib/gs-*/src +%{_libdir}/erlang/man/man3/gs.* %files hipe %defattr(-,root,root) @@ -897,6 +1057,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/ic-*/include %{_libdir}/erlang/lib/ic-*/priv %{_libdir}/erlang/lib/ic-*/src +%{_libdir}/erlang/man/man3/ic.* +%{_libdir}/erlang/man/man3/ic_clib.* +%{_libdir}/erlang/man/man3/ic_c_protocol.* %files inets %defattr(-,root,root) @@ -904,10 +1067,28 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/inets-*/ebin %{_libdir}/erlang/lib/inets-*/priv %{_libdir}/erlang/lib/inets-*/src +%{_libdir}/erlang/man/man3/ftp.* +%{_libdir}/erlang/man/man3/httpc.* +%{_libdir}/erlang/man/man3/httpd.* +%{_libdir}/erlang/man/man3/httpd_conf.* +%{_libdir}/erlang/man/man3/httpd_socket.* +%{_libdir}/erlang/man/man3/httpd_util.* +%{_libdir}/erlang/man/man3/inets.* +%{_libdir}/erlang/man/man3/mod_alias.* +%{_libdir}/erlang/man/man3/mod_auth.* +%{_libdir}/erlang/man/man3/mod_esi.* +%{_libdir}/erlang/man/man3/mod_security.* +%{_libdir}/erlang/man/man3/tftp.* %files inviso %defattr(-,root,root) %{_libdir}/erlang/lib/inviso-*/ +%{_libdir}/erlang/man/man3/inviso.* +%{_libdir}/erlang/man/man3/inviso_as_lib.* +%{_libdir}/erlang/man/man3/inviso_lfm.* +%{_libdir}/erlang/man/man3/inviso_lfm_tpfreader.* +%{_libdir}/erlang/man/man3/inviso_rt.* +%{_libdir}/erlang/man/man3/inviso_rt_meta.* %files jinterface %defattr(-,root,root) @@ -919,6 +1100,39 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/kernel-*/ebin %{_libdir}/erlang/lib/kernel-*/include %{_libdir}/erlang/lib/kernel-*/src +%{_libdir}/erlang/man/man3/application.* +%{_libdir}/erlang/man/man3/auth.* +%{_libdir}/erlang/man/man3/code.* +%{_libdir}/erlang/man/man3/disk_log.* +%{_libdir}/erlang/man/man3/erl_boot_server.* +%{_libdir}/erlang/man/man3/erl_ddll.* +%{_libdir}/erlang/man/man3/erl_prim_loader_stub.* +%{_libdir}/erlang/man/man3/erlang_stub.* +%{_libdir}/erlang/man/man3/error_handler.* +%{_libdir}/erlang/man/man3/error_logger.* +%{_libdir}/erlang/man/man3/file.* +%{_libdir}/erlang/man/man3/gen_sctp.* +%{_libdir}/erlang/man/man3/gen_tcp.* +%{_libdir}/erlang/man/man3/gen_udp.* +%{_libdir}/erlang/man/man3/global.* +%{_libdir}/erlang/man/man3/global_group.* +%{_libdir}/erlang/man/man3/heart.* +%{_libdir}/erlang/man/man3/inet.* +%{_libdir}/erlang/man/man3/inet_res.* +%{_libdir}/erlang/man/man3/init_stub.* +%{_libdir}/erlang/man/man3/net_adm.* +%{_libdir}/erlang/man/man3/net_kernel.* +%{_libdir}/erlang/man/man3/os.* +%{_libdir}/erlang/man/man3/packages.* +%{_libdir}/erlang/man/man3/pg2.* +%{_libdir}/erlang/man/man3/rpc.* +%{_libdir}/erlang/man/man3/seq_trace.* +%{_libdir}/erlang/man/man3/user.* +%{_libdir}/erlang/man/man3/wrap_log_reader.* +%{_libdir}/erlang/man/man3/zlib_stub.* +%{_libdir}/erlang/man/man4/app.* +%{_libdir}/erlang/man/man4/config.* +%{_libdir}/erlang/man/man6/kernel.* %files megaco %defattr(-,root,root) @@ -927,6 +1141,18 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/megaco-*/include %{_libdir}/erlang/lib/megaco-*/priv %{_libdir}/erlang/lib/megaco-*/src +%{_libdir}/erlang/man/man3/megaco.* +%{_libdir}/erlang/man/man3/megaco_codec_meas.* +%{_libdir}/erlang/man/man3/megaco_codec_mstone1.* +%{_libdir}/erlang/man/man3/megaco_codec_mstone2.* +%{_libdir}/erlang/man/man3/megaco_codec_transform.* +%{_libdir}/erlang/man/man3/megaco_edist_compress.* +%{_libdir}/erlang/man/man3/megaco_encoder.* +%{_libdir}/erlang/man/man3/megaco_flex_scanner.* +%{_libdir}/erlang/man/man3/megaco_tcp.* +%{_libdir}/erlang/man/man3/megaco_transport.* +%{_libdir}/erlang/man/man3/megaco_udp.* +%{_libdir}/erlang/man/man3/megaco_user.* %files mnesia %defattr(-,root,root) @@ -934,14 +1160,21 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/mnesia-*/ebin %{_libdir}/erlang/lib/mnesia-*/include %{_libdir}/erlang/lib/mnesia-*/src +%{_libdir}/erlang/man/man3/mnesia.* +%{_libdir}/erlang/man/man3/mnesia_frag_hash.* +%{_libdir}/erlang/man/man3/mnesia_registry.* %files observer %defattr(-,root,root) %{_libdir}/erlang/lib/observer-*/ +%{_libdir}/erlang/man/man3/crashdump.* +%{_libdir}/erlang/man/man3/ttb.* +%{_libdir}/erlang/man/man6/observer.* %files odbc %defattr(-,root,root) %{_libdir}/erlang/lib/odbc-*/ +%{_libdir}/erlang/man/man3/odbc.* %files orber %defattr(-,root,root) @@ -952,36 +1185,69 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/orber-*/java_src %{_libdir}/erlang/lib/orber-*/priv %{_libdir}/erlang/lib/orber-*/src +%{_libdir}/erlang/man/man3/CosNaming.* +%{_libdir}/erlang/man/man3/CosNaming_BindingIterator.* +%{_libdir}/erlang/man/man3/CosNaming_NamingContext.* +%{_libdir}/erlang/man/man3/CosNaming_NamingContextExt.* +%{_libdir}/erlang/man/man3/Module_Interface.* +%{_libdir}/erlang/man/man3/any.* +%{_libdir}/erlang/man/man3/corba.* +%{_libdir}/erlang/man/man3/corba_object.* +%{_libdir}/erlang/man/man3/etop.* +%{_libdir}/erlang/man/man3/fixed.* +%{_libdir}/erlang/man/man3/interceptors.* +%{_libdir}/erlang/man/man3/lname.* +%{_libdir}/erlang/man/man3/lname_component.* +%{_libdir}/erlang/man/man3/orber.* +%{_libdir}/erlang/man/man3/orber_acl.* +%{_libdir}/erlang/man/man3/orber_diagnostics.* +%{_libdir}/erlang/man/man3/orber_ifr.* +%{_libdir}/erlang/man/man3/orber_tc.* %files os_mon %defattr(-,root,root) %{_libdir}/erlang/lib/os_mon-*/ +%{_libdir}/erlang/man/man3/cpu_sup.* +%{_libdir}/erlang/man/man3/disksup.* +%{_libdir}/erlang/man/man3/memsup.* +%{_libdir}/erlang/man/man3/os_mon_mib.* +%{_libdir}/erlang/man/man3/os_sup.* +%{_libdir}/erlang/man/man6/os_mon.* %files otp_mibs %defattr(-,root,root) %{_libdir}/erlang/lib/otp_mibs-*/ +%{_libdir}/erlang/man/man3/otp_mib.* %files parsetools %defattr(-,root,root) %{_libdir}/erlang/lib/parsetools-*/ +%{_libdir}/erlang/man/man3/leex.* +%{_libdir}/erlang/man/man3/yecc.* %files percept %defattr(-,root,root) %{_libdir}/erlang/lib/percept-*/ +%{_libdir}/erlang/man/man3/egd.* +%{_libdir}/erlang/man/man3/percept.* +%{_libdir}/erlang/man/man3/percept_profile.* %files pman %defattr(-,root,root) %{_libdir}/erlang/lib/pman-*/ +%{_libdir}/erlang/man/man3/pman.* %files public_key %defattr(-,root,root) %{_libdir}/erlang/lib/public_key-*/ +%{_libdir}/erlang/man/man3/public_key.* %files reltool %defattr(-,root,root) %dir %{_libdir}/erlang/lib/reltool-*/ %{_libdir}/erlang/lib/reltool-*/ebin %{_libdir}/erlang/lib/reltool-*/src +%{_libdir}/erlang/man/man3/reltool.* %files rpm-macros %defattr(-,root,root) @@ -994,10 +1260,23 @@ rm -rf $RPM_BUILD_ROOT %files runtime_tools %defattr(-,root,root) %{_libdir}/erlang/lib/runtime_tools-*/ +%{_libdir}/erlang/man/man3/dbg.* +%{_libdir}/erlang/man/man3/erts_alloc_config.* +%{_libdir}/erlang/man/man6/runtime_tools.* %files sasl %defattr(-,root,root) %{_libdir}/erlang/lib/sasl-*/ +%{_libdir}/erlang/man/man3/alarm_handler.* +%{_libdir}/erlang/man/man3/overload.* +%{_libdir}/erlang/man/man3/rb.* +%{_libdir}/erlang/man/man3/release_handler.* +%{_libdir}/erlang/man/man3/systools.* +%{_libdir}/erlang/man/man4/appup.* +%{_libdir}/erlang/man/man4/rel.* +%{_libdir}/erlang/man/man4/relup.* +%{_libdir}/erlang/man/man4/script.* +%{_libdir}/erlang/man/man6/sasl.* %files snmp %defattr(-,root,root) @@ -1007,10 +1286,62 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/snmp-*/mibs %{_libdir}/erlang/lib/snmp-*/priv %{_libdir}/erlang/lib/snmp-*/src +%{_libdir}/erlang/man/man3/snmp.* +%{_libdir}/erlang/man/man3/snmpa.* +%{_libdir}/erlang/man/man3/snmpa_conf.* +%{_libdir}/erlang/man/man3/snmpa_discovery_handler.* +%{_libdir}/erlang/man/man3/snmpa_error.* +%{_libdir}/erlang/man/man3/snmpa_error_io.* +%{_libdir}/erlang/man/man3/snmpa_error_logger.* +%{_libdir}/erlang/man/man3/snmpa_error_report.* +%{_libdir}/erlang/man/man3/snmpa_local_db.* +%{_libdir}/erlang/man/man3/snmpa_mpd.* +%{_libdir}/erlang/man/man3/snmpa_network_interface.* +%{_libdir}/erlang/man/man3/snmpa_network_interface_filter.* +%{_libdir}/erlang/man/man3/snmpa_notification_delivery_info_receiver.* +%{_libdir}/erlang/man/man3/snmpa_notification_filter.* +%{_libdir}/erlang/man/man3/snmpa_supervisor.* +%{_libdir}/erlang/man/man3/snmpc.* +%{_libdir}/erlang/man/man3/snmp_community_mib.* +%{_libdir}/erlang/man/man3/snmp_framework_mib.* +%{_libdir}/erlang/man/man3/snmp_generic.* +%{_libdir}/erlang/man/man3/snmp_index.* +%{_libdir}/erlang/man/man3/snmpm.* +%{_libdir}/erlang/man/man3/snmpm_conf.* +%{_libdir}/erlang/man/man3/snmpm_mpd.* +%{_libdir}/erlang/man/man3/snmpm_network_interface.* +%{_libdir}/erlang/man/man3/snmpm_network_interface_filter.* +%{_libdir}/erlang/man/man3/snmpm_user.* +%{_libdir}/erlang/man/man3/snmp_notification_mib.* +%{_libdir}/erlang/man/man3/snmp_pdus.* +%{_libdir}/erlang/man/man3/snmp_standard_mib.* +%{_libdir}/erlang/man/man3/snmp_target_mib.* +%{_libdir}/erlang/man/man3/snmp_user_based_sm_mib.* +%{_libdir}/erlang/man/man3/snmp_view_based_acm_mib.* +%{_libdir}/erlang/man/man6/snmp.* +%{_libdir}/erlang/man/man7/INET-ADDRESS-MIB.* +%{_libdir}/erlang/man/man7/OTP-SNMPEA-MIB.* +%{_libdir}/erlang/man/man7/RFC1213-MIB.* +%{_libdir}/erlang/man/man7/SNMP-COMMUNITY-MIB.* +%{_libdir}/erlang/man/man7/SNMP-FRAMEWORK-MIB.* +%{_libdir}/erlang/man/man7/SNMP-MPD-MIB.* +%{_libdir}/erlang/man/man7/SNMP-NOTIFICATION-MIB.* +%{_libdir}/erlang/man/man7/SNMP-TARGET-MIB.* +%{_libdir}/erlang/man/man7/SNMP-USER-BASED-SM-MIB.* +%{_libdir}/erlang/man/man7/SNMP-USM-AES-MIB.* +%{_libdir}/erlang/man/man7/SNMPv2-MIB.* +%{_libdir}/erlang/man/man7/SNMPv2-TM.* +%{_libdir}/erlang/man/man7/SNMP-VIEW-BASED-ACM-MIB.* +%{_libdir}/erlang/man/man7/STANDARD-MIB.* %files ssh %defattr(-,root,root) %{_libdir}/erlang/lib/ssh-*/ +%{_libdir}/erlang/man/man3/ssh.* +%{_libdir}/erlang/man/man3/ssh_channel.* +%{_libdir}/erlang/man/man3/ssh_connection.* +%{_libdir}/erlang/man/man3/ssh_sftp.* +%{_libdir}/erlang/man/man3/ssh_sftpd.* %files ssl %defattr(-,root,root) @@ -1020,6 +1351,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/ssl-*/pkix %{_libdir}/erlang/lib/ssl-*/priv %{_libdir}/erlang/lib/ssl-*/src +%{_libdir}/erlang/man/man3/new_ssl.* +%{_libdir}/erlang/man/man3/ssl.* +%{_libdir}/erlang/man/man6/ssl.* %files stdlib %defattr(-,root,root) @@ -1027,19 +1361,91 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/stdlib-*/ebin %{_libdir}/erlang/lib/stdlib-*/include %{_libdir}/erlang/lib/stdlib-*/src +%{_libdir}/erlang/man/man3/array.* +%{_libdir}/erlang/man/man3/base64.* +%{_libdir}/erlang/man/man3/beam_lib.* +%{_libdir}/erlang/man/man3/c.* +%{_libdir}/erlang/man/man3/calendar.* +%{_libdir}/erlang/man/man3/dets.* +%{_libdir}/erlang/man/man3/dict.* +%{_libdir}/erlang/man/man3/digraph.* +%{_libdir}/erlang/man/man3/digraph_utils.* +%{_libdir}/erlang/man/man3/epp.* +%{_libdir}/erlang/man/man3/erl_eval.* +%{_libdir}/erlang/man/man3/erl_expand_records.* +%{_libdir}/erlang/man/man3/erl_id_trans.* +%{_libdir}/erlang/man/man3/erl_internal.* +%{_libdir}/erlang/man/man3/erl_lint.* +%{_libdir}/erlang/man/man3/erl_parse.* +%{_libdir}/erlang/man/man3/erl_pp.* +%{_libdir}/erlang/man/man3/erl_scan.* +%{_libdir}/erlang/man/man3/erl_tar.* +%{_libdir}/erlang/man/man3/ets.* +%{_libdir}/erlang/man/man3/file_sorter.* +%{_libdir}/erlang/man/man3/filelib.* +%{_libdir}/erlang/man/man3/filename.* +%{_libdir}/erlang/man/man3/gb_sets.* +%{_libdir}/erlang/man/man3/gb_trees.* +%{_libdir}/erlang/man/man3/gen_event.* +%{_libdir}/erlang/man/man3/gen_fsm.* +%{_libdir}/erlang/man/man3/gen_server.* +%{_libdir}/erlang/man/man3/io.* +%{_libdir}/erlang/man/man3/io_lib.* +%{_libdir}/erlang/man/man3/lib.* +%{_libdir}/erlang/man/man3/lists.* +%{_libdir}/erlang/man/man3/log_mf_h.* +%{_libdir}/erlang/man/man3/math.* +%{_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/random.* +%{_libdir}/erlang/man/man3/re.* +%{_libdir}/erlang/man/man3/regexp.* +%{_libdir}/erlang/man/man3/sets.* +%{_libdir}/erlang/man/man3/shell.* +%{_libdir}/erlang/man/man3/shell_default.* +%{_libdir}/erlang/man/man3/slave.* +%{_libdir}/erlang/man/man3/sofs.* +%{_libdir}/erlang/man/man3/string.* +%{_libdir}/erlang/man/man3/supervisor.* +%{_libdir}/erlang/man/man3/supervisor_bridge.* +%{_libdir}/erlang/man/man3/sys.* +%{_libdir}/erlang/man/man3/timer.* +%{_libdir}/erlang/man/man3/unicode.* +%{_libdir}/erlang/man/man3/zip.* +%{_libdir}/erlang/man/man6/stdlib.* %files syntax_tools %defattr(-,root,root) %dir %{_libdir}/erlang/lib/syntax_tools-*/ %{_libdir}/erlang/lib/syntax_tools-*/ebin +%{_libdir}/erlang/man/man3/epp_dodger.* +%{_libdir}/erlang/man/man3/erl_comment_scan.* +%{_libdir}/erlang/man/man3/erl_prettypr.* +%{_libdir}/erlang/man/man3/erl_recomment.* +%{_libdir}/erlang/man/man3/erl_syntax.* +%{_libdir}/erlang/man/man3/erl_syntax_lib.* +%{_libdir}/erlang/man/man3/erl_tidy.* +%{_libdir}/erlang/man/man3/igor.* +%{_libdir}/erlang/man/man3/prettypr.* %files test_server %defattr(-,root,root) %{_libdir}/erlang/lib/test_server-*/ +%{_libdir}/erlang/man/man3/test_server.* +%{_libdir}/erlang/man/man3/test_server_ctrl.* +%{_libdir}/erlang/man/man6/test_server.* %files toolbar %defattr(-,root,root) %{_libdir}/erlang/lib/toolbar-*/ +%{_libdir}/erlang/man/man3/toolbar.* %files tools %defattr(-,root,root) @@ -1049,10 +1455,21 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/tools-*/emacs %{_libdir}/erlang/lib/tools-*/priv %{_libdir}/erlang/lib/tools-*/src +%{_libdir}/erlang/man/man3/cover.* +%{_libdir}/erlang/man/man3/cprof.* +%{_libdir}/erlang/man/man3/eprof.* +%{_libdir}/erlang/man/man3/erlang_mode.* +%{_libdir}/erlang/man/man3/fprof.* +%{_libdir}/erlang/man/man3/instrument.* +%{_libdir}/erlang/man/man3/lcnt.* +%{_libdir}/erlang/man/man3/make.* +%{_libdir}/erlang/man/man3/tags.* +%{_libdir}/erlang/man/man3/xref.* %files tv %defattr(-,root,root) %{_libdir}/erlang/lib/tv-*/ +%{_libdir}/erlang/man/man3/tv.* %files typer %defattr(-,root,root) @@ -1061,6 +1478,8 @@ rm -rf $RPM_BUILD_ROOT %files webtool %defattr(-,root,root) %{_libdir}/erlang/lib/webtool-*/ +%{_libdir}/erlang/man/man1/start_webtool.* +%{_libdir}/erlang/man/man3/webtool.* %files wx %defattr(-,root,root) @@ -1069,17 +1488,249 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/wx-*/include %{_libdir}/erlang/lib/wx-*/priv %{_libdir}/erlang/lib/wx-*/src +%{_libdir}/erlang/man/man3/gl.* +%{_libdir}/erlang/man/man3/glu.* +%{_libdir}/erlang/man/man3/wx.* +%{_libdir}/erlang/man/man3/wx_misc.* +%{_libdir}/erlang/man/man3/wx_object.* +%{_libdir}/erlang/man/man3/wxAcceleratorEntry.* +%{_libdir}/erlang/man/man3/wxAcceleratorTable.* +%{_libdir}/erlang/man/man3/wxArtProvider.* +%{_libdir}/erlang/man/man3/wxAuiDockArt.* +%{_libdir}/erlang/man/man3/wxAuiManager.* +%{_libdir}/erlang/man/man3/wxAuiManagerEvent.* +%{_libdir}/erlang/man/man3/wxAuiNotebook.* +%{_libdir}/erlang/man/man3/wxAuiNotebookEvent.* +%{_libdir}/erlang/man/man3/wxAuiPaneInfo.* +%{_libdir}/erlang/man/man3/wxAuiTabArt.* +%{_libdir}/erlang/man/man3/wxBitmap.* +%{_libdir}/erlang/man/man3/wxBitmapButton.* +%{_libdir}/erlang/man/man3/wxBitmapDataObject.* +%{_libdir}/erlang/man/man3/wxBoxSizer.* +%{_libdir}/erlang/man/man3/wxBrush.* +%{_libdir}/erlang/man/man3/wxBufferedDC.* +%{_libdir}/erlang/man/man3/wxBufferedPaintDC.* +%{_libdir}/erlang/man/man3/wxButton.* +%{_libdir}/erlang/man/man3/wxCalendarCtrl.* +%{_libdir}/erlang/man/man3/wxCalendarDateAttr.* +%{_libdir}/erlang/man/man3/wxCalendarEvent.* +%{_libdir}/erlang/man/man3/wxCaret.* +%{_libdir}/erlang/man/man3/wxCheckBox.* +%{_libdir}/erlang/man/man3/wxCheckListBox.* +%{_libdir}/erlang/man/man3/wxChildFocusEvent.* +%{_libdir}/erlang/man/man3/wxChoice.* +%{_libdir}/erlang/man/man3/wxChoicebook.* +%{_libdir}/erlang/man/man3/wxClientDC.* +%{_libdir}/erlang/man/man3/wxClipboard.* +%{_libdir}/erlang/man/man3/wxCloseEvent.* +%{_libdir}/erlang/man/man3/wxColourData.* +%{_libdir}/erlang/man/man3/wxColourDialog.* +%{_libdir}/erlang/man/man3/wxColourPickerCtrl.* +%{_libdir}/erlang/man/man3/wxColourPickerEvent.* +%{_libdir}/erlang/man/man3/wxComboBox.* +%{_libdir}/erlang/man/man3/wxCommandEvent.* +%{_libdir}/erlang/man/man3/wxContextMenuEvent.* +%{_libdir}/erlang/man/man3/wxControl.* +%{_libdir}/erlang/man/man3/wxControlWithItems.* +%{_libdir}/erlang/man/man3/wxCursor.* +%{_libdir}/erlang/man/man3/wxDataObject.* +%{_libdir}/erlang/man/man3/wxDateEvent.* +%{_libdir}/erlang/man/man3/wxDatePickerCtrl.* +%{_libdir}/erlang/man/man3/wxDC.* +%{_libdir}/erlang/man/man3/wxDialog.* +%{_libdir}/erlang/man/man3/wxDirDialog.* +%{_libdir}/erlang/man/man3/wxDirPickerCtrl.* +%{_libdir}/erlang/man/man3/wxDisplayChangedEvent.* +%{_libdir}/erlang/man/man3/wxEraseEvent.* +%{_libdir}/erlang/man/man3/wxEvent.* +%{_libdir}/erlang/man/man3/wxEvtHandler.* +%{_libdir}/erlang/man/man3/wxFileDataObject.* +%{_libdir}/erlang/man/man3/wxFileDialog.* +%{_libdir}/erlang/man/man3/wxFileDirPickerEvent.* +%{_libdir}/erlang/man/man3/wxFilePickerCtrl.* +%{_libdir}/erlang/man/man3/wxFindReplaceData.* +%{_libdir}/erlang/man/man3/wxFindReplaceDialog.* +%{_libdir}/erlang/man/man3/wxFlexGridSizer.* +%{_libdir}/erlang/man/man3/wxFocusEvent.* +%{_libdir}/erlang/man/man3/wxFont.* +%{_libdir}/erlang/man/man3/wxFontData.* +%{_libdir}/erlang/man/man3/wxFontDialog.* +%{_libdir}/erlang/man/man3/wxFontPickerCtrl.* +%{_libdir}/erlang/man/man3/wxFontPickerEvent.* +%{_libdir}/erlang/man/man3/wxFrame.* +%{_libdir}/erlang/man/man3/wxGauge.* +%{_libdir}/erlang/man/man3/wxGBSizerItem.* +%{_libdir}/erlang/man/man3/wxGenericDirCtrl.* +%{_libdir}/erlang/man/man3/wxGLCanvas.* +%{_libdir}/erlang/man/man3/wxGraphicsBrush.* +%{_libdir}/erlang/man/man3/wxGraphicsContext.* +%{_libdir}/erlang/man/man3/wxGraphicsFont.* +%{_libdir}/erlang/man/man3/wxGraphicsMatrix.* +%{_libdir}/erlang/man/man3/wxGraphicsObject.* +%{_libdir}/erlang/man/man3/wxGraphicsPath.* +%{_libdir}/erlang/man/man3/wxGraphicsPen.* +%{_libdir}/erlang/man/man3/wxGraphicsRenderer.* +%{_libdir}/erlang/man/man3/wxGrid.* +%{_libdir}/erlang/man/man3/wxGridBagSizer.* +%{_libdir}/erlang/man/man3/wxGridCellAttr.* +%{_libdir}/erlang/man/man3/wxGridCellBoolEditor.* +%{_libdir}/erlang/man/man3/wxGridCellBoolRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellChoiceEditor.* +%{_libdir}/erlang/man/man3/wxGridCellEditor.* +%{_libdir}/erlang/man/man3/wxGridCellFloatEditor.* +%{_libdir}/erlang/man/man3/wxGridCellFloatRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellNumberEditor.* +%{_libdir}/erlang/man/man3/wxGridCellNumberRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellStringRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellTextEditor.* +%{_libdir}/erlang/man/man3/wxGridEvent.* +%{_libdir}/erlang/man/man3/wxGridSizer.* +%{_libdir}/erlang/man/man3/wxHelpEvent.* +%{_libdir}/erlang/man/man3/wxHtmlEasyPrinting.* +%{_libdir}/erlang/man/man3/wxHtmlLinkEvent.* +%{_libdir}/erlang/man/man3/wxHtmlWindow.* +%{_libdir}/erlang/man/man3/wxIcon.* +%{_libdir}/erlang/man/man3/wxIconBundle.* +%{_libdir}/erlang/man/man3/wxIconizeEvent.* +%{_libdir}/erlang/man/man3/wxIdleEvent.* +%{_libdir}/erlang/man/man3/wxImage.* +%{_libdir}/erlang/man/man3/wxImageList.* +%{_libdir}/erlang/man/man3/wxJoystickEvent.* +%{_libdir}/erlang/man/man3/wxKeyEvent.* +%{_libdir}/erlang/man/man3/wxLayoutAlgorithm.* +%{_libdir}/erlang/man/man3/wxListbook.* +%{_libdir}/erlang/man/man3/wxListBox.* +%{_libdir}/erlang/man/man3/wxListCtrl.* +%{_libdir}/erlang/man/man3/wxListEvent.* +%{_libdir}/erlang/man/man3/wxListItem.* +%{_libdir}/erlang/man/man3/wxListView.* +%{_libdir}/erlang/man/man3/wxLogNull.* +%{_libdir}/erlang/man/man3/wxMask.* +%{_libdir}/erlang/man/man3/wxMaximizeEvent.* +%{_libdir}/erlang/man/man3/wxMDIChildFrame.* +%{_libdir}/erlang/man/man3/wxMDIClientWindow.* +%{_libdir}/erlang/man/man3/wxMDIParentFrame.* +%{_libdir}/erlang/man/man3/wxMemoryDC.* +%{_libdir}/erlang/man/man3/wxMenu.* +%{_libdir}/erlang/man/man3/wxMenuBar.* +%{_libdir}/erlang/man/man3/wxMenuEvent.* +%{_libdir}/erlang/man/man3/wxMenuItem.* +%{_libdir}/erlang/man/man3/wxMessageDialog.* +%{_libdir}/erlang/man/man3/wxMiniFrame.* +%{_libdir}/erlang/man/man3/wxMirrorDC.* +%{_libdir}/erlang/man/man3/wxMouseCaptureChangedEvent.* +%{_libdir}/erlang/man/man3/wxMouseEvent.* +%{_libdir}/erlang/man/man3/wxMoveEvent.* +%{_libdir}/erlang/man/man3/wxMultiChoiceDialog.* +%{_libdir}/erlang/man/man3/wxNavigationKeyEvent.* +%{_libdir}/erlang/man/man3/wxNcPaintEvent.* +%{_libdir}/erlang/man/man3/wxNotebook.* +%{_libdir}/erlang/man/man3/wxNotebookEvent.* +%{_libdir}/erlang/man/man3/wxNotifyEvent.* +%{_libdir}/erlang/man/man3/wxPageSetupDialog.* +%{_libdir}/erlang/man/man3/wxPageSetupDialogData.* +%{_libdir}/erlang/man/man3/wxPaintDC.* +%{_libdir}/erlang/man/man3/wxPaintEvent.* +%{_libdir}/erlang/man/man3/wxPalette.* +%{_libdir}/erlang/man/man3/wxPaletteChangedEvent.* +%{_libdir}/erlang/man/man3/wxPanel.* +%{_libdir}/erlang/man/man3/wxPasswordEntryDialog.* +%{_libdir}/erlang/man/man3/wxPen.* +%{_libdir}/erlang/man/man3/wxPickerBase.* +%{_libdir}/erlang/man/man3/wxPostScriptDC.* +%{_libdir}/erlang/man/man3/wxPreviewCanvas.* +%{_libdir}/erlang/man/man3/wxPreviewControlBar.* +%{_libdir}/erlang/man/man3/wxPreviewFrame.* +%{_libdir}/erlang/man/man3/wxPrintData.* +%{_libdir}/erlang/man/man3/wxPrintDialog.* +%{_libdir}/erlang/man/man3/wxPrintDialogData.* +%{_libdir}/erlang/man/man3/wxPrinter.* +%{_libdir}/erlang/man/man3/wxPrintout.* +%{_libdir}/erlang/man/man3/wxPrintPreview.* +%{_libdir}/erlang/man/man3/wxProgressDialog.* +%{_libdir}/erlang/man/man3/wxQueryNewPaletteEvent.* +%{_libdir}/erlang/man/man3/wxRadioBox.* +%{_libdir}/erlang/man/man3/wxRadioButton.* +%{_libdir}/erlang/man/man3/wxRegion.* +%{_libdir}/erlang/man/man3/wxSashEvent.* +%{_libdir}/erlang/man/man3/wxSashLayoutWindow.* +%{_libdir}/erlang/man/man3/wxSashWindow.* +%{_libdir}/erlang/man/man3/wxScreenDC.* +%{_libdir}/erlang/man/man3/wxScrollBar.* +%{_libdir}/erlang/man/man3/wxScrolledWindow.* +%{_libdir}/erlang/man/man3/wxScrollEvent.* +%{_libdir}/erlang/man/man3/wxScrollWinEvent.* +%{_libdir}/erlang/man/man3/wxSetCursorEvent.* +%{_libdir}/erlang/man/man3/wxShowEvent.* +%{_libdir}/erlang/man/man3/wxSingleChoiceDialog.* +%{_libdir}/erlang/man/man3/wxSizeEvent.* +%{_libdir}/erlang/man/man3/wxSizer.* +%{_libdir}/erlang/man/man3/wxSizerFlags.* +%{_libdir}/erlang/man/man3/wxSizerItem.* +%{_libdir}/erlang/man/man3/wxSlider.* +%{_libdir}/erlang/man/man3/wxSpinButton.* +%{_libdir}/erlang/man/man3/wxSpinCtrl.* +%{_libdir}/erlang/man/man3/wxSpinEvent.* +%{_libdir}/erlang/man/man3/wxSplashScreen.* +%{_libdir}/erlang/man/man3/wxSplitterEvent.* +%{_libdir}/erlang/man/man3/wxSplitterWindow.* +%{_libdir}/erlang/man/man3/wxStaticBitmap.* +%{_libdir}/erlang/man/man3/wxStaticBox.* +%{_libdir}/erlang/man/man3/wxStaticBoxSizer.* +%{_libdir}/erlang/man/man3/wxStaticLine.* +%{_libdir}/erlang/man/man3/wxStaticText.* +%{_libdir}/erlang/man/man3/wxStatusBar.* +%{_libdir}/erlang/man/man3/wxStdDialogButtonSizer.* +%{_libdir}/erlang/man/man3/wxStyledTextCtrl.* +%{_libdir}/erlang/man/man3/wxStyledTextEvent.* +%{_libdir}/erlang/man/man3/wxSysColourChangedEvent.* +%{_libdir}/erlang/man/man3/wxTextAttr.* +%{_libdir}/erlang/man/man3/wxTextCtrl.* +%{_libdir}/erlang/man/man3/wxTextDataObject.* +%{_libdir}/erlang/man/man3/wxTextEntryDialog.* +%{_libdir}/erlang/man/man3/wxToggleButton.* +%{_libdir}/erlang/man/man3/wxToolBar.* +%{_libdir}/erlang/man/man3/wxToolbook.* +%{_libdir}/erlang/man/man3/wxToolTip.* +%{_libdir}/erlang/man/man3/wxTopLevelWindow.* +%{_libdir}/erlang/man/man3/wxTreebook.* +%{_libdir}/erlang/man/man3/wxTreeCtrl.* +%{_libdir}/erlang/man/man3/wxTreeEvent.* +%{_libdir}/erlang/man/man3/wxUpdateUIEvent.* +%{_libdir}/erlang/man/man3/wxWindow.* +%{_libdir}/erlang/man/man3/wxWindowCreateEvent.* +%{_libdir}/erlang/man/man3/wxWindowDC.* +%{_libdir}/erlang/man/man3/wxWindowDestroyEvent.* +%{_libdir}/erlang/man/man3/wxXmlResource.* %files xmerl %defattr(-,root,root) %{_libdir}/erlang/lib/xmerl-*/ +%{_libdir}/erlang/man/man3/xmerl.* +%{_libdir}/erlang/man/man3/xmerl_eventp.* +%{_libdir}/erlang/man/man3/xmerl_sax_parser.* +%{_libdir}/erlang/man/man3/xmerl_scan.* +%{_libdir}/erlang/man/man3/xmerl_xpath.* +%{_libdir}/erlang/man/man3/xmerl_xs.* +%{_libdir}/erlang/man/man3/xmerl_xsd.* -%post -%{_libdir}/erlang/Install -minimal -cross %{_libdir}/erlang >/dev/null 2>/dev/null +%changelog +* Wed Apr 28 2010 Peter Lemenkov - R13B-04.9 +- Added missing files, necessary for emacs (see rhbz #585349) +- Patches rebased +* Tue Apr 27 2010 Peter Lemenkov - R13B-04.8 +- Added missing BuildRequires libxslt (for building docs) +- Removed %%post script completely (resolves rhbz #586428) +- Since now both docs and man-pages are built from sources +- No need to manually create symlinks in %%{_bindir} + +* Mon Apr 26 2010 Peter Lemenkov - R13B-04.7 +- Build with erlang-rpm-macros +- Man-files are packed with packages, they belong to -%changelog * Mon Apr 26 2010 Peter Lemenkov - R13B-04.6 - Made erlang-rpm-macros as separate package - Fix error while installing erlang-rpm-macros diff --git a/import.log b/import.log index eed822f..691638c 100644 --- a/import.log +++ b/import.log @@ -4,3 +4,4 @@ erlang-R13B-04_3_fc12:F-13:erlang-R13B-04.3.fc12.src.rpm:1271239209 erlang-R13B-04_4_fc12:F-13:erlang-R13B-04.4.fc12.src.rpm:1271523813 erlang-R13B-04_5_fc12:F-13:erlang-R13B-04.5.fc12.src.rpm:1272271184 erlang-R13B-04_6_fc12:F-13:erlang-R13B-04.6.fc12.src.rpm:1272303676 +erlang-R13B-04_9_fc12:F-13:erlang-R13B-04.9.fc12.src.rpm:1272528169 diff --git a/otp-0001-Do-not-format-man-pages.patch b/otp-0001-Do-not-format-man-pages.patch index 5f9594f..632408b 100644 --- a/otp-0001-Do-not-format-man-pages.patch +++ b/otp-0001-Do-not-format-man-pages.patch @@ -1,7 +1,7 @@ From 80fd602b5cd9f4aaa7b6bd95e174708e27601db5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 25 Feb 2010 16:45:28 +0300 -Subject: [PATCH 1/9] Do not format man-pages +Subject: [PATCH 1/7] Do not format man-pages Signed-off-by: Peter Lemenkov --- diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 0293073..1da9a67 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -1,7 +1,7 @@ From 2e10f728feb56ea96b2832999a8c34f1f19646bc Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 25 Feb 2010 16:57:43 +0300 -Subject: [PATCH 2/9] Remove rpath +Subject: [PATCH 2/7] Remove rpath Signed-off-by: Peter Lemenkov --- diff --git a/otp-0004-Fix-shared-libraries-installation.patch b/otp-0004-Fix-shared-libraries-installation.patch new file mode 100644 index 0000000..f828169 --- /dev/null +++ b/otp-0004-Fix-shared-libraries-installation.patch @@ -0,0 +1,58 @@ +From edaced375235a006c87a3e15b8b17e9bc6dbb923 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 15 Apr 2010 13:31:36 +0400 +Subject: [PATCH 4/7] Fix shared libraries installation + +Several shared libraries (asn1_erl_drv.so, megaco_flex_scanner_drv_mt.so, +megaco_flex_scanner_drv.so, wxe_driver.so) were installed as data files +previously. + +Signed-off-by: Peter Lemenkov +--- + lib/asn1/c_src/Makefile | 2 +- + lib/megaco/src/flex/Makefile.in | 2 +- + lib/wx/c_src/Makefile.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile +index 906c513..9e9cb18 100644 +--- a/lib/asn1/c_src/Makefile ++++ b/lib/asn1/c_src/Makefile +@@ -124,7 +124,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/lib +- $(INSTALL_DATA) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib + $(INSTALL_DIR) $(RELSYSDIR)/c_src + $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src + +diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in +index 6ce9b34..5af651d 100644 +--- a/lib/megaco/src/flex/Makefile.in ++++ b/lib/megaco/src/flex/Makefile.in +@@ -280,7 +280,7 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) + $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex +- $(INSTALL_DATA) $(SOLIBS) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib + endif + + +diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in +index 5a0b4ce..8710641 100644 +--- a/lib/wx/c_src/Makefile.in ++++ b/lib/wx/c_src/Makefile.in +@@ -167,7 +167,7 @@ release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/$(SYS_TYPE) + $(INSTALL_DATA) ../priv/erlang-logo32.png $(RELSYSDIR)/priv/ + $(INSTALL_DATA) ../priv/erlang-logo64.png $(RELSYSDIR)/priv/ +- $(INSTALL_DATA) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) ++ $(INSTALL_PROGRAM) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) + + release_docs_spec: + +-- +1.6.6.1 + diff --git a/otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch b/otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch new file mode 100644 index 0000000..4f55214 --- /dev/null +++ b/otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch @@ -0,0 +1,35 @@ +From 3475d4f155dc4bc2919e371e614fee81f01e87d5 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Fri, 16 Apr 2010 21:13:47 +0400 +Subject: [PATCH 5/7] Fix for dlopening libGL and libGLU + +Signed-off-by: Peter Lemenkov +--- + lib/wx/c_src/wxe_gl.cpp | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp +index 63dd68f..36bf15f 100644 +--- a/lib/wx/c_src/wxe_gl.cpp ++++ b/lib/wx/c_src/wxe_gl.cpp +@@ -81,7 +81,7 @@ int initOpenGL() + WCHAR * DLName = wxT("opengl32.dll"); + HMODULE LIBhandle = LoadLibrary(DLName); + #else +- char * DLName = (char *) "libGL.so"; ++ char * DLName = (char *) "libGL.so.1"; + void * LIBhandle = dlopen(DLName, RTLD_LAZY); + #endif + // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); +@@ -132,7 +132,7 @@ int initOpenGL() + DLName = wxT("glu32.dll"); + LIBhandle = LoadLibrary(DLName); + #else +- DLName = (char *) "libGLU.so"; ++ DLName = (char *) "libGLU.so.1"; + LIBhandle = dlopen(DLName, RTLD_LAZY); + #endif + // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); +-- +1.6.6.1 + diff --git a/otp-0006-Fix-check-for-compile-workspace-overflow.patch b/otp-0006-Fix-check-for-compile-workspace-overflow.patch new file mode 100644 index 0000000..37363de --- /dev/null +++ b/otp-0006-Fix-check-for-compile-workspace-overflow.patch @@ -0,0 +1,55 @@ +From 400034faee44b65a5e33014e7ce4edcfcfba870f Mon Sep 17 00:00:00 2001 +From: Michael Santos +Date: Thu, 18 Mar 2010 20:08:10 -0400 +Subject: [PATCH 6/7] Fix check for compile workspace overflow + +Patch from: +http://vcs.pcre.org/viewvc/code/trunk/pcre_compile.c?r1=504&r2=505&view=patch + +Test case: +N = 819, re:compile([lists:duplicate(N, $(), lists:duplicate(N, $))]). + +Compiling large regular expressions could overflow the workspace +buffer. Modify the test to check for a value smaller than the buffer +size. +--- + erts/emulator/pcre/pcre_compile.c | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c +index 2974336..9508c5a 100644 +--- a/erts/emulator/pcre/pcre_compile.c ++++ b/erts/emulator/pcre/pcre_compile.c +@@ -92,6 +92,11 @@ is 4 there is plenty of room. */ + + #define COMPILE_WORK_SIZE (4096) + ++/* The overrun tests check for a slightly smaller size so that they detect the ++overrun before it actually does run off the end of the data block. */ ++ ++#define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100) ++ + + /* Table for handling escaped characters in the range '0'-'z'. Positive returns + are simple data values; negative values are for special things like \d and so +@@ -2445,7 +2450,7 @@ for (;; ptr++) + #ifdef DEBUG + if (code > cd->hwm) cd->hwm = code; /* High water info */ + #endif +- if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */ ++ if (code > cd->start_workspace + WORK_SIZE_CHECK) /* Check for overrun */ + { + *errorcodeptr = ERR52; + goto FAILED; +@@ -2494,7 +2499,7 @@ for (;; ptr++) + /* In the real compile phase, just check the workspace used by the forward + reference list. */ + +- else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE) ++ else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK) + { + *errorcodeptr = ERR52; + goto FAILED; +-- +1.6.6.1 + diff --git a/otp-0006-Fix-shared-libraries-installation.patch b/otp-0006-Fix-shared-libraries-installation.patch deleted file mode 100644 index 2df3cb4..0000000 --- a/otp-0006-Fix-shared-libraries-installation.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0c963550412174a4c4fe64aa7f70189998abef41 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Thu, 15 Apr 2010 13:31:36 +0400 -Subject: [PATCH 6/9] Fix shared libraries installation - -Several shared libraries (asn1_erl_drv.so, megaco_flex_scanner_drv_mt.so, -megaco_flex_scanner_drv.so, wxe_driver.so) were installed as data files -previously. - -Signed-off-by: Peter Lemenkov ---- - lib/asn1/c_src/Makefile | 2 +- - lib/megaco/src/flex/Makefile.in | 2 +- - lib/wx/c_src/Makefile.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile -index 906c513..9e9cb18 100644 ---- a/lib/asn1/c_src/Makefile -+++ b/lib/asn1/c_src/Makefile -@@ -124,7 +124,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/priv/lib -- $(INSTALL_DATA) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib -+ $(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib - $(INSTALL_DIR) $(RELSYSDIR)/c_src - $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src - -diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index 6ce9b34..5af651d 100644 ---- a/lib/megaco/src/flex/Makefile.in -+++ b/lib/megaco/src/flex/Makefile.in -@@ -280,7 +280,7 @@ release_spec: opt - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) - $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex -- $(INSTALL_DATA) $(SOLIBS) $(RELSYSDIR)/priv/lib -+ $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib - endif - - -diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in -index 5a0b4ce..8710641 100644 ---- a/lib/wx/c_src/Makefile.in -+++ b/lib/wx/c_src/Makefile.in -@@ -167,7 +167,7 @@ release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/priv/$(SYS_TYPE) - $(INSTALL_DATA) ../priv/erlang-logo32.png $(RELSYSDIR)/priv/ - $(INSTALL_DATA) ../priv/erlang-logo64.png $(RELSYSDIR)/priv/ -- $(INSTALL_DATA) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) -+ $(INSTALL_PROGRAM) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) - - release_docs_spec: - --- -1.6.6.1 - diff --git a/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch b/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch deleted file mode 100644 index 5e78c4a..0000000 --- a/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6ffccff36e0d94cba0412cf3a29769b4a19d3be3 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Fri, 16 Apr 2010 21:13:47 +0400 -Subject: [PATCH 7/9] Fix for dlopening libGL and libGLU - -Signed-off-by: Peter Lemenkov ---- - lib/wx/c_src/wxe_gl.cpp | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp -index 63dd68f..36bf15f 100644 ---- a/lib/wx/c_src/wxe_gl.cpp -+++ b/lib/wx/c_src/wxe_gl.cpp -@@ -81,7 +81,7 @@ int initOpenGL() - WCHAR * DLName = wxT("opengl32.dll"); - HMODULE LIBhandle = LoadLibrary(DLName); - #else -- char * DLName = (char *) "libGL.so"; -+ char * DLName = (char *) "libGL.so.1"; - void * LIBhandle = dlopen(DLName, RTLD_LAZY); - #endif - // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); -@@ -132,7 +132,7 @@ int initOpenGL() - DLName = wxT("glu32.dll"); - LIBhandle = LoadLibrary(DLName); - #else -- DLName = (char *) "libGLU.so"; -+ DLName = (char *) "libGLU.so.1"; - LIBhandle = dlopen(DLName, RTLD_LAZY); - #endif - // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); --- -1.6.6.1 - diff --git a/otp-0007-Install-missing-emacs-files.patch b/otp-0007-Install-missing-emacs-files.patch new file mode 100644 index 0000000..389c517 --- /dev/null +++ b/otp-0007-Install-missing-emacs-files.patch @@ -0,0 +1,28 @@ +From 09e0f9ec22f680c759feea2e90913128ce2a249d Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Wed, 28 Apr 2010 14:35:59 +0400 +Subject: [PATCH 7/7] Install missing emacs files + +Signed-off-by: Peter Lemenkov +--- + lib/tools/emacs/Makefile | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/lib/tools/emacs/Makefile b/lib/tools/emacs/Makefile +index 7249263..17978de 100644 +--- a/lib/tools/emacs/Makefile ++++ b/lib/tools/emacs/Makefile +@@ -38,7 +38,10 @@ MAN_FILES= \ + + EMACS_FILES= \ + erlang-start \ ++ erlang-skels-old \ ++ erlang-skels \ + erlang-eunit \ ++ erlang_appwiz \ + erlang + + README_FILES= README +-- +1.6.6.1 + diff --git a/otp-0008-Fix-check-for-compile-workspace-overflow.patch b/otp-0008-Fix-check-for-compile-workspace-overflow.patch deleted file mode 100644 index 2e34451..0000000 --- a/otp-0008-Fix-check-for-compile-workspace-overflow.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d496ce48940411976617b66a5c941c78313cb78c Mon Sep 17 00:00:00 2001 -From: Michael Santos -Date: Thu, 18 Mar 2010 20:08:10 -0400 -Subject: [PATCH 8/9] Fix check for compile workspace overflow - -Patch from: -http://vcs.pcre.org/viewvc/code/trunk/pcre_compile.c?r1=504&r2=505&view=patch - -Test case: -N = 819, re:compile([lists:duplicate(N, $(), lists:duplicate(N, $))]). - -Compiling large regular expressions could overflow the workspace -buffer. Modify the test to check for a value smaller than the buffer -size. ---- - erts/emulator/pcre/pcre_compile.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c -index 2974336..9508c5a 100644 ---- a/erts/emulator/pcre/pcre_compile.c -+++ b/erts/emulator/pcre/pcre_compile.c -@@ -92,6 +92,11 @@ is 4 there is plenty of room. */ - - #define COMPILE_WORK_SIZE (4096) - -+/* The overrun tests check for a slightly smaller size so that they detect the -+overrun before it actually does run off the end of the data block. */ -+ -+#define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100) -+ - - /* Table for handling escaped characters in the range '0'-'z'. Positive returns - are simple data values; negative values are for special things like \d and so -@@ -2445,7 +2450,7 @@ for (;; ptr++) - #ifdef DEBUG - if (code > cd->hwm) cd->hwm = code; /* High water info */ - #endif -- if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */ -+ if (code > cd->start_workspace + WORK_SIZE_CHECK) /* Check for overrun */ - { - *errorcodeptr = ERR52; - goto FAILED; -@@ -2494,7 +2499,7 @@ for (;; ptr++) - /* In the real compile phase, just check the workspace used by the forward - reference list. */ - -- else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE) -+ else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK) - { - *errorcodeptr = ERR52; - goto FAILED; --- -1.6.6.1 - diff --git a/sources b/sources index 9207cc0..2216c4f 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -d69ce51bfabbdd0808461d86dfc95689 otp_doc_html_R13B04.tar.gz -681aaef70affc64743f4e8c0675034af otp_doc_man_R13B04.tar.gz ca6da4921e438891967900aa6a084341 otp_src_R13B04.tar.gz -- cgit From 7113516667f42523a26fb60cb69c26e54af74ba0 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 29 Apr 2010 08:08:36 +0000 Subject: Added autogenerated deps, fixed install of emacs files and much more --- .cvsignore | 2 - erlang.spec | 775 +++++++++++++++++++-- import.log | 1 + otp-0001-Do-not-format-man-pages.patch | 2 +- otp-0002-Remove-rpath.patch | 2 +- otp-0004-Fix-shared-libraries-installation.patch | 58 ++ otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch | 35 + ...-Fix-check-for-compile-workspace-overflow.patch | 55 ++ otp-0006-Fix-shared-libraries-installation.patch | 58 -- otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch | 35 - otp-0007-Install-missing-emacs-files.patch | 28 + ...-Fix-check-for-compile-workspace-overflow.patch | 55 -- sources | 2 - 13 files changed, 892 insertions(+), 216 deletions(-) create mode 100644 otp-0004-Fix-shared-libraries-installation.patch create mode 100644 otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch create mode 100644 otp-0006-Fix-check-for-compile-workspace-overflow.patch delete mode 100644 otp-0006-Fix-shared-libraries-installation.patch delete mode 100644 otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch create mode 100644 otp-0007-Install-missing-emacs-files.patch delete mode 100644 otp-0008-Fix-check-for-compile-workspace-overflow.patch diff --git a/.cvsignore b/.cvsignore index 697a4fc..ae1a587 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -otp_doc_html_R13B04.tar.gz -otp_doc_man_R13B04.tar.gz otp_src_R13B04.tar.gz diff --git a/erlang.spec b/erlang.spec index dc4e6d2..c59a8ce 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,42 +3,45 @@ %define ver R13B %define rel 04 -Name: erlang -Version: %{ver} -Release: %{rel}.6%{?dist} -Summary: General-purpose programming language and runtime environment - -Group: Development/Languages -License: ERPL -URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_%{ver}%{rel}.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_%{ver}%{rel}.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_%{ver}%{rel}.tar.gz +Name: erlang +Version: %{ver} +Release: %{rel}.9%{?dist} +Summary: General-purpose programming language and runtime environment + +Group: Development/Languages +License: ERPL +URL: http://www.erlang.org +Source0: http://www.erlang.org/download/otp_src_%{ver}%{rel}.tar.gz Source3: erlang-find-provides.escript Source4: erlang-find-provides.sh Source5: erlang-find-requires.escript Source6: erlang-find-requires.sh Source7: macros.erlang # TODO this patch needs rebase against current tree -Patch0: otp-links.patch +Patch0: otp-links.patch # Fedora-specific Patch1: otp-0001-Do-not-format-man-pages.patch # Fedora-specific Patch2: otp-0002-Remove-rpath.patch # Upstreamed -Patch6: otp-0006-Fix-shared-libraries-installation.patch +Patch4: otp-0004-Fix-shared-libraries-installation.patch # Fedora-specific -Patch7: otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch +Patch5: otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch # Upstreamed -Patch8: otp-0008-Fix-check-for-compile-workspace-overflow.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch6: otp-0006-Fix-check-for-compile-workspace-overflow.patch +# Install accidentally forgotten emacs files (see rhbz #585349) (already fixed upstream) +Patch7: otp-0007-Install-missing-emacs-files.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel -BuildRequires: openssl-devel +BuildRequires: openssl-devel BuildRequires: zlib-devel -BuildRequires: flex +BuildRequires: flex BuildRequires: m4 BuildRequires: fop +BuildRequires: libxslt +# Required for erlang-rpm-macros +BuildRequires: erlang Requires: erlang-appmon = %{version}-%{release} Requires: erlang-asn1 = %{version}-%{release} @@ -50,7 +53,7 @@ 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-cosTransactions = %{version}-%{release} Requires: erlang-crypto = %{version}-%{release} Requires: erlang-debugger = %{version}-%{release} Requires: erlang-dialyzer = %{version}-%{release} @@ -194,13 +197,14 @@ Obsoletes: %{name} < R13B-04.5 %description cosTime Orber OMG Timer and TimerEvent Service. -%package cosTransaction +%package cosTransactions Summary: Orber OMG Transaction Service Group: Development/Languages Requires: %{name}-erts = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 +Obsoletes: %{name}-cosTransaction < R13B-04.7 -%description cosTransaction +%description cosTransactions Orber OMG Transaction Service. %package crypto @@ -234,6 +238,7 @@ A DIscrepany AnaLYZer for ERlang programs. Summary: Erlang documentation Group: Development/Languages BuildArch: noarch +Requires: %{name} = %{version}-%{release} Obsoletes: %{name}-doc < R13B-04.4 %description doc @@ -647,9 +652,10 @@ Provides support for XML 1.0. %setup -q -n otp_src_%{ver}%{rel} %patch1 -p1 -b .do_not_format_manpages %patch2 -p1 -b .rpath -%patch6 -p1 -b .fix_shared_lib_install -%patch7 -p1 -b .dlopen_opengl_libs -%patch8 -p1 -b .pcre_overflow +%patch4 -p1 -b .fix_shared_lib_install +%patch5 -p1 -b .dlopen_opengl_libs +%patch6 -p1 -b .pcre_overflow +%patch7 -p1 -b .missing_emacs_files # remove shipped zlib sources rm -f erts/emulator/zlib/*.[ch] @@ -661,11 +667,13 @@ CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enabl CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib %endif make +make docs %install rm -rf $RPM_BUILD_ROOT -make INSTALL_PREFIX=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT install-docs # fix 0775 permission on some directories find $RPM_BUILD_ROOT%{_libdir}/erlang -type d -perm 0775 | xargs chmod 755 @@ -676,26 +684,32 @@ chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist/src/Ma chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/Makefile chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/src/Makefile -# install additional doc files -mkdir -p erlang_doc -tar -C erlang_doc -zxf %{SOURCE1} - -# install man-pages -tar -C $RPM_BUILD_ROOT%{_libdir}/erlang -zxf %{SOURCE2} -gzip $RPM_BUILD_ROOT%{_libdir}/erlang/man/man*/* - -# make links to binaries -mkdir -p $RPM_BUILD_ROOT%{_bindir} -cd $RPM_BUILD_ROOT%{_bindir} -for file in erl erlc escript dialyzer -do - ln -sf ../%{_lib}/erlang/bin/$file . -done - -# Remove batch files intended to use on one proprietary OS. +# Relocate doc-files into the proper directory +mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib +pushd . +cd $RPM_BUILD_ROOT%{_libdir}/erlang +mv -v doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +for i in erts-* ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/$i ; done +cd $RPM_BUILD_ROOT%{_libdir}/erlang/lib +for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib/$i || true ; done +popd +cp -av AUTHORS EPLICENCE README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} + +# Win32-specific functionality 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/os_mon-*/ebin/nteventlog.beam rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/webtool-*/priv/bin/start_webtool.bat +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/erlsrv.* +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/werl.* +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/nteventlog.* +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/win32reg.* + +# VxWorks specific +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/erl_set_memory_block.* # Remove old txt files rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/etc/otpCA/index.txt.old @@ -706,6 +720,7 @@ for d in $RPM_BUILD_ROOT%{_libdir}/erlang/lib/* ; do find $d/src -type f ! -name 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 find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/*/src -type d -empty -delete +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/cosFileTransfer-*/src # remove C and Java sources rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/c_src @@ -716,14 +731,12 @@ 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 directories -rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/doc +# remove empty directory 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/hipe-*/vsn.mk +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/*-*/info +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/hipe-*/vsn.mk # No longer needed utilities for formatting man-pages rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/misc @@ -740,6 +753,8 @@ install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-req install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-requires.sh install -D -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.erlang +# remove outdated script +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/Install %clean rm -rf $RPM_BUILD_ROOT @@ -747,15 +762,18 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) - -%doc AUTHORS EPLICENCE README.md -%doc %{_libdir}/erlang/PR.template -%doc %{_libdir}/erlang/README -%doc %{_libdir}/erlang/COPYRIGHT +%dir %{_docdir}/%{name}-%{ver}-%{rel}/ +%doc %{_docdir}/%{name}-%{ver}-%{rel}/AUTHORS +%doc %{_docdir}/%{name}-%{ver}-%{rel}/COPYRIGHT +%doc %{_docdir}/%{name}-%{ver}-%{rel}/EPLICENCE +%doc %{_docdir}/%{name}-%{ver}-%{rel}/PR.template +%doc %{_docdir}/%{name}-%{ver}-%{rel}/README +%doc %{_docdir}/%{name}-%{ver}-%{rel}/README.md %files appmon %defattr(-,root,root) %{_libdir}/erlang/lib/appmon-*/ +%{_libdir}/erlang/man/man3/appmon.* %files asn1 %defattr(-,root,root) @@ -763,66 +781,167 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/asn1-*/ebin %{_libdir}/erlang/lib/asn1-*/priv %{_libdir}/erlang/lib/asn1-*/src +%{_libdir}/erlang/man/man3/asn1ct.* +%{_libdir}/erlang/man/man3/asn1rt.* %files common_test %defattr(-,root,root) %{_libdir}/erlang/lib/common_test-*/ +%{_libdir}/erlang/man/man1/run_test.* +%{_libdir}/erlang/man/man3/ct.* +%{_libdir}/erlang/man/man3/ct_cover.* +%{_libdir}/erlang/man/man3/ct_ftp.* +%{_libdir}/erlang/man/man3/ct_master.* +%{_libdir}/erlang/man/man3/ct_rpc.* +%{_libdir}/erlang/man/man3/ct_snmp.* +%{_libdir}/erlang/man/man3/ct_ssh.* +%{_libdir}/erlang/man/man3/ct_telnet.* +%{_libdir}/erlang/man/man3/unix_telnet.* +%{_libdir}/erlang/man/man6/common_test.* %files compiler %defattr(-,root,root) %{_libdir}/erlang/lib/compiler-*/ +%{_libdir}/erlang/man/man3/compile.* %files cosEvent %defattr(-,root,root) %{_libdir}/erlang/lib/cosEvent-*/ +%{_libdir}/erlang/man/man3/cosEventApp.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ConsumerAdmin.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_EventChannel.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPullConsumer.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPullSupplier.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPushConsumer.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPushSupplier.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_SupplierAdmin.* %files cosEventDomain %defattr(-,root,root) %{_libdir}/erlang/lib/cosEventDomain-*/ +%{_libdir}/erlang/man/man3/CosEventDomainAdmin.* +%{_libdir}/erlang/man/man3/CosEventDomainAdmin_EventDomain.* +%{_libdir}/erlang/man/man3/CosEventDomainAdmin_EventDomainFactory.* +%{_libdir}/erlang/man/man3/cosEventDomainApp.* %files cosFileTransfer %defattr(-,root,root) %{_libdir}/erlang/lib/cosFileTransfer-*/ +%{_libdir}/erlang/man/man3/cosFileTransferApp.* +%{_libdir}/erlang/man/man3/CosFileTransfer_Directory.* +%{_libdir}/erlang/man/man3/CosFileTransfer_File.* +%{_libdir}/erlang/man/man3/CosFileTransfer_FileIterator.* +%{_libdir}/erlang/man/man3/CosFileTransfer_FileTransferSession.* +%{_libdir}/erlang/man/man3/CosFileTransfer_VirtualFileSystem.* %files cosNotification %defattr(-,root,root) %{_libdir}/erlang/lib/cosNotification-*/ +%{_libdir}/erlang/man/man3/CosNotification.* +%{_libdir}/erlang/man/man3/CosNotification_AdminPropertiesAdmin.* +%{_libdir}/erlang/man/man3/cosNotificationApp.* +%{_libdir}/erlang/man/man3/CosNotification_QoSAdmin.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ConsumerAdmin.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_EventChannel.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_EventChannelFactory.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPullConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPullSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPushConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPushSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxySupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPullConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPullSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPushConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPushSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPullConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPullSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPushConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPushSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SupplierAdmin.* +%{_libdir}/erlang/man/man3/CosNotifyComm_NotifyPublish.* +%{_libdir}/erlang/man/man3/CosNotifyComm_NotifySubscribe.* +%{_libdir}/erlang/man/man3/CosNotifyFilter_Filter.* +%{_libdir}/erlang/man/man3/CosNotifyFilter_FilterAdmin.* +%{_libdir}/erlang/man/man3/CosNotifyFilter_FilterFactory.* +%{_libdir}/erlang/man/man3/CosNotifyFilter_MappingFilter.* %files cosProperty %defattr(-,root,root) %{_libdir}/erlang/lib/cosProperty-*/ +%{_libdir}/erlang/man/man3/cosProperty.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertiesIterator.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertyNamesIterator.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertySet.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetDef.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetDefFactory.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetFactory.* %files cosTime %defattr(-,root,root) %{_libdir}/erlang/lib/cosTime-*/ - -%files cosTransaction +%{_libdir}/erlang/man/man3/cosTime.* +%{_libdir}/erlang/man/man3/CosTimerEvent_TimerEventHandler.* +%{_libdir}/erlang/man/man3/CosTimerEvent_TimerEventService.* +%{_libdir}/erlang/man/man3/CosTime_TimeService.* +%{_libdir}/erlang/man/man3/CosTime_TIO.* +%{_libdir}/erlang/man/man3/CosTime_UTO.* + +%files cosTransactions %defattr(-,root,root) %{_libdir}/erlang/lib/cosTransactions-*/ +%{_libdir}/erlang/man/man3/cosTransactions.* +%{_libdir}/erlang/man/man3/CosTransactions_Control.* +%{_libdir}/erlang/man/man3/CosTransactions_Coordinator.* +%{_libdir}/erlang/man/man3/CosTransactions_RecoveryCoordinator.* +%{_libdir}/erlang/man/man3/CosTransactions_Resource.* +%{_libdir}/erlang/man/man3/CosTransactions_SubtransactionAwareResource.* +%{_libdir}/erlang/man/man3/CosTransactions_Terminator.* +%{_libdir}/erlang/man/man3/CosTransactions_TransactionFactory.* %files crypto %defattr(-,root,root) %{_libdir}/erlang/lib/crypto-*/ +%{_libdir}/erlang/man/man3/crypto.* +%{_libdir}/erlang/man/man6/crypto.* %files debugger %defattr(-,root,root) %{_libdir}/erlang/lib/debugger-*/ +%{_libdir}/erlang/man/man3/debugger.* +%{_libdir}/erlang/man/man3/i.* +%{_libdir}/erlang/man/man3/int.* %files dialyzer %defattr(-,root,root) %{_libdir}/erlang/lib/dialyzer-*/ +%{_libdir}/erlang/man/man3/dialyzer.* %files doc %defattr(-,root,root) -%doc erlang_doc/* +%doc %{_docdir}/%{name}-%{ver}-%{rel}/doc +%doc %{_docdir}/%{name}-%{ver}-%{rel}/erts-*/ +%doc %{_docdir}/%{name}-%{ver}-%{rel}/lib/ + %files docbuilder %defattr(-,root,root) %{_libdir}/erlang/lib/docbuilder-*/ +%{_libdir}/erlang/man/man3/docb_gen.* +%{_libdir}/erlang/man/man3/docb_transform.* +%{_libdir}/erlang/man/man3/docb_xml_check.* +%{_libdir}/erlang/man/man6/docbuilder.* %files edoc %defattr(-,root,root) %{_libdir}/erlang/lib/edoc-*/ +%{_libdir}/erlang/man/man3/edoc.* +%{_libdir}/erlang/man/man3/edoc_doclet.* +%{_libdir}/erlang/man/man3/edoc_extract.* +%{_libdir}/erlang/man/man3/edoc_layout.* +%{_libdir}/erlang/man/man3/edoc_lib.* +%{_libdir}/erlang/man/man3/edoc_run.* %files erl_docgen %defattr(-,root,root) @@ -831,19 +950,53 @@ rm -rf $RPM_BUILD_ROOT %files erl_interface %defattr(-,root,root) %{_libdir}/erlang/lib/erl_interface-*/ +%{_libdir}/erlang/man/man1/erl_call.* +%{_libdir}/erlang/man/man3/ei.* +%{_libdir}/erlang/man/man3/ei_connect.* +%{_libdir}/erlang/man/man3/erl_connect.* +%{_libdir}/erlang/man/man3/erl_error.* +%{_libdir}/erlang/man/man3/erl_eterm.* +%{_libdir}/erlang/man/man3/erl_format.* +%{_libdir}/erlang/man/man3/erl_global.* +%{_libdir}/erlang/man/man3/erl_malloc.* +%{_libdir}/erlang/man/man3/erl_marshal.* +%{_libdir}/erlang/man/man3/registry.* %files erts %defattr(-,root,root) -%dir %{_libdir}/erlang + +# TODO these directories should be packaged separately +%dir %{_libdir}/erlang/ +%dir %{_libdir}/erlang/bin/ %dir %{_libdir}/erlang/lib/ +%dir %{_libdir}/erlang/man/ +%dir %{_libdir}/erlang/man/man1/ +%dir %{_libdir}/erlang/man/man3/ +%dir %{_libdir}/erlang/man/man4/ +%dir %{_libdir}/erlang/man/man6/ +%dir %{_libdir}/erlang/man/man7/ +%dir %{_libdir}/erlang/releases/ + %{_bindir}/* %{_libdir}/erlang/bin/ %{_libdir}/erlang/erts-*/ %{_libdir}/erlang/lib/erts-*/ -%{_libdir}/erlang/man/ -%{_libdir}/erlang/releases/ +%{_libdir}/erlang/man/man1/epmd.* +%{_libdir}/erlang/man/man1/erl.* +%{_libdir}/erlang/man/man1/erlc.* +%{_libdir}/erlang/man/man1/escript.* +%{_libdir}/erlang/man/man1/run_erl.* +%{_libdir}/erlang/man/man1/start.* +%{_libdir}/erlang/man/man1/start_erl.* +%{_libdir}/erlang/man/man3/driver_entry.* +%{_libdir}/erlang/man/man3/erl_driver.* +%{_libdir}/erlang/man/man3/erl_prim_loader.* +%{_libdir}/erlang/man/man3/erlang.* +%{_libdir}/erlang/man/man3/erts_alloc.* +%{_libdir}/erlang/man/man3/init.* +%{_libdir}/erlang/man/man3/zlib.* +%{_libdir}/erlang/releases/* %{_libdir}/erlang/usr/ -%{_libdir}/erlang/Install %files et %defattr(-,root,root) @@ -851,12 +1004,18 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/et-*/ebin %{_libdir}/erlang/lib/et-*/include %{_libdir}/erlang/lib/et-*/src +%{_libdir}/erlang/man/man3/et.* +%{_libdir}/erlang/man/man3/et_collector.* +%{_libdir}/erlang/man/man3/et_selector.* +%{_libdir}/erlang/man/man3/et_viewer.* %files eunit %defattr(-,root,root) %dir %{_libdir}/erlang/lib/eunit-*/ %{_libdir}/erlang/lib/eunit-*/ebin %{_libdir}/erlang/lib/eunit-*/include +%{_libdir}/erlang/man/man3/eunit.* +%{_libdir}/erlang/man/man3/eunit_surefire.* %files examples %defattr(-,root,root) @@ -885,6 +1044,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/gs-*/ebin %{_libdir}/erlang/lib/gs-*/priv %{_libdir}/erlang/lib/gs-*/src +%{_libdir}/erlang/man/man3/gs.* %files hipe %defattr(-,root,root) @@ -897,6 +1057,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/ic-*/include %{_libdir}/erlang/lib/ic-*/priv %{_libdir}/erlang/lib/ic-*/src +%{_libdir}/erlang/man/man3/ic.* +%{_libdir}/erlang/man/man3/ic_clib.* +%{_libdir}/erlang/man/man3/ic_c_protocol.* %files inets %defattr(-,root,root) @@ -904,10 +1067,28 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/inets-*/ebin %{_libdir}/erlang/lib/inets-*/priv %{_libdir}/erlang/lib/inets-*/src +%{_libdir}/erlang/man/man3/ftp.* +%{_libdir}/erlang/man/man3/httpc.* +%{_libdir}/erlang/man/man3/httpd.* +%{_libdir}/erlang/man/man3/httpd_conf.* +%{_libdir}/erlang/man/man3/httpd_socket.* +%{_libdir}/erlang/man/man3/httpd_util.* +%{_libdir}/erlang/man/man3/inets.* +%{_libdir}/erlang/man/man3/mod_alias.* +%{_libdir}/erlang/man/man3/mod_auth.* +%{_libdir}/erlang/man/man3/mod_esi.* +%{_libdir}/erlang/man/man3/mod_security.* +%{_libdir}/erlang/man/man3/tftp.* %files inviso %defattr(-,root,root) %{_libdir}/erlang/lib/inviso-*/ +%{_libdir}/erlang/man/man3/inviso.* +%{_libdir}/erlang/man/man3/inviso_as_lib.* +%{_libdir}/erlang/man/man3/inviso_lfm.* +%{_libdir}/erlang/man/man3/inviso_lfm_tpfreader.* +%{_libdir}/erlang/man/man3/inviso_rt.* +%{_libdir}/erlang/man/man3/inviso_rt_meta.* %files jinterface %defattr(-,root,root) @@ -919,6 +1100,39 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/kernel-*/ebin %{_libdir}/erlang/lib/kernel-*/include %{_libdir}/erlang/lib/kernel-*/src +%{_libdir}/erlang/man/man3/application.* +%{_libdir}/erlang/man/man3/auth.* +%{_libdir}/erlang/man/man3/code.* +%{_libdir}/erlang/man/man3/disk_log.* +%{_libdir}/erlang/man/man3/erl_boot_server.* +%{_libdir}/erlang/man/man3/erl_ddll.* +%{_libdir}/erlang/man/man3/erl_prim_loader_stub.* +%{_libdir}/erlang/man/man3/erlang_stub.* +%{_libdir}/erlang/man/man3/error_handler.* +%{_libdir}/erlang/man/man3/error_logger.* +%{_libdir}/erlang/man/man3/file.* +%{_libdir}/erlang/man/man3/gen_sctp.* +%{_libdir}/erlang/man/man3/gen_tcp.* +%{_libdir}/erlang/man/man3/gen_udp.* +%{_libdir}/erlang/man/man3/global.* +%{_libdir}/erlang/man/man3/global_group.* +%{_libdir}/erlang/man/man3/heart.* +%{_libdir}/erlang/man/man3/inet.* +%{_libdir}/erlang/man/man3/inet_res.* +%{_libdir}/erlang/man/man3/init_stub.* +%{_libdir}/erlang/man/man3/net_adm.* +%{_libdir}/erlang/man/man3/net_kernel.* +%{_libdir}/erlang/man/man3/os.* +%{_libdir}/erlang/man/man3/packages.* +%{_libdir}/erlang/man/man3/pg2.* +%{_libdir}/erlang/man/man3/rpc.* +%{_libdir}/erlang/man/man3/seq_trace.* +%{_libdir}/erlang/man/man3/user.* +%{_libdir}/erlang/man/man3/wrap_log_reader.* +%{_libdir}/erlang/man/man3/zlib_stub.* +%{_libdir}/erlang/man/man4/app.* +%{_libdir}/erlang/man/man4/config.* +%{_libdir}/erlang/man/man6/kernel.* %files megaco %defattr(-,root,root) @@ -927,6 +1141,18 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/megaco-*/include %{_libdir}/erlang/lib/megaco-*/priv %{_libdir}/erlang/lib/megaco-*/src +%{_libdir}/erlang/man/man3/megaco.* +%{_libdir}/erlang/man/man3/megaco_codec_meas.* +%{_libdir}/erlang/man/man3/megaco_codec_mstone1.* +%{_libdir}/erlang/man/man3/megaco_codec_mstone2.* +%{_libdir}/erlang/man/man3/megaco_codec_transform.* +%{_libdir}/erlang/man/man3/megaco_edist_compress.* +%{_libdir}/erlang/man/man3/megaco_encoder.* +%{_libdir}/erlang/man/man3/megaco_flex_scanner.* +%{_libdir}/erlang/man/man3/megaco_tcp.* +%{_libdir}/erlang/man/man3/megaco_transport.* +%{_libdir}/erlang/man/man3/megaco_udp.* +%{_libdir}/erlang/man/man3/megaco_user.* %files mnesia %defattr(-,root,root) @@ -934,14 +1160,21 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/mnesia-*/ebin %{_libdir}/erlang/lib/mnesia-*/include %{_libdir}/erlang/lib/mnesia-*/src +%{_libdir}/erlang/man/man3/mnesia.* +%{_libdir}/erlang/man/man3/mnesia_frag_hash.* +%{_libdir}/erlang/man/man3/mnesia_registry.* %files observer %defattr(-,root,root) %{_libdir}/erlang/lib/observer-*/ +%{_libdir}/erlang/man/man3/crashdump.* +%{_libdir}/erlang/man/man3/ttb.* +%{_libdir}/erlang/man/man6/observer.* %files odbc %defattr(-,root,root) %{_libdir}/erlang/lib/odbc-*/ +%{_libdir}/erlang/man/man3/odbc.* %files orber %defattr(-,root,root) @@ -952,36 +1185,69 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/orber-*/java_src %{_libdir}/erlang/lib/orber-*/priv %{_libdir}/erlang/lib/orber-*/src +%{_libdir}/erlang/man/man3/CosNaming.* +%{_libdir}/erlang/man/man3/CosNaming_BindingIterator.* +%{_libdir}/erlang/man/man3/CosNaming_NamingContext.* +%{_libdir}/erlang/man/man3/CosNaming_NamingContextExt.* +%{_libdir}/erlang/man/man3/Module_Interface.* +%{_libdir}/erlang/man/man3/any.* +%{_libdir}/erlang/man/man3/corba.* +%{_libdir}/erlang/man/man3/corba_object.* +%{_libdir}/erlang/man/man3/etop.* +%{_libdir}/erlang/man/man3/fixed.* +%{_libdir}/erlang/man/man3/interceptors.* +%{_libdir}/erlang/man/man3/lname.* +%{_libdir}/erlang/man/man3/lname_component.* +%{_libdir}/erlang/man/man3/orber.* +%{_libdir}/erlang/man/man3/orber_acl.* +%{_libdir}/erlang/man/man3/orber_diagnostics.* +%{_libdir}/erlang/man/man3/orber_ifr.* +%{_libdir}/erlang/man/man3/orber_tc.* %files os_mon %defattr(-,root,root) %{_libdir}/erlang/lib/os_mon-*/ +%{_libdir}/erlang/man/man3/cpu_sup.* +%{_libdir}/erlang/man/man3/disksup.* +%{_libdir}/erlang/man/man3/memsup.* +%{_libdir}/erlang/man/man3/os_mon_mib.* +%{_libdir}/erlang/man/man3/os_sup.* +%{_libdir}/erlang/man/man6/os_mon.* %files otp_mibs %defattr(-,root,root) %{_libdir}/erlang/lib/otp_mibs-*/ +%{_libdir}/erlang/man/man3/otp_mib.* %files parsetools %defattr(-,root,root) %{_libdir}/erlang/lib/parsetools-*/ +%{_libdir}/erlang/man/man3/leex.* +%{_libdir}/erlang/man/man3/yecc.* %files percept %defattr(-,root,root) %{_libdir}/erlang/lib/percept-*/ +%{_libdir}/erlang/man/man3/egd.* +%{_libdir}/erlang/man/man3/percept.* +%{_libdir}/erlang/man/man3/percept_profile.* %files pman %defattr(-,root,root) %{_libdir}/erlang/lib/pman-*/ +%{_libdir}/erlang/man/man3/pman.* %files public_key %defattr(-,root,root) %{_libdir}/erlang/lib/public_key-*/ +%{_libdir}/erlang/man/man3/public_key.* %files reltool %defattr(-,root,root) %dir %{_libdir}/erlang/lib/reltool-*/ %{_libdir}/erlang/lib/reltool-*/ebin %{_libdir}/erlang/lib/reltool-*/src +%{_libdir}/erlang/man/man3/reltool.* %files rpm-macros %defattr(-,root,root) @@ -994,10 +1260,23 @@ rm -rf $RPM_BUILD_ROOT %files runtime_tools %defattr(-,root,root) %{_libdir}/erlang/lib/runtime_tools-*/ +%{_libdir}/erlang/man/man3/dbg.* +%{_libdir}/erlang/man/man3/erts_alloc_config.* +%{_libdir}/erlang/man/man6/runtime_tools.* %files sasl %defattr(-,root,root) %{_libdir}/erlang/lib/sasl-*/ +%{_libdir}/erlang/man/man3/alarm_handler.* +%{_libdir}/erlang/man/man3/overload.* +%{_libdir}/erlang/man/man3/rb.* +%{_libdir}/erlang/man/man3/release_handler.* +%{_libdir}/erlang/man/man3/systools.* +%{_libdir}/erlang/man/man4/appup.* +%{_libdir}/erlang/man/man4/rel.* +%{_libdir}/erlang/man/man4/relup.* +%{_libdir}/erlang/man/man4/script.* +%{_libdir}/erlang/man/man6/sasl.* %files snmp %defattr(-,root,root) @@ -1007,10 +1286,62 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/snmp-*/mibs %{_libdir}/erlang/lib/snmp-*/priv %{_libdir}/erlang/lib/snmp-*/src +%{_libdir}/erlang/man/man3/snmp.* +%{_libdir}/erlang/man/man3/snmpa.* +%{_libdir}/erlang/man/man3/snmpa_conf.* +%{_libdir}/erlang/man/man3/snmpa_discovery_handler.* +%{_libdir}/erlang/man/man3/snmpa_error.* +%{_libdir}/erlang/man/man3/snmpa_error_io.* +%{_libdir}/erlang/man/man3/snmpa_error_logger.* +%{_libdir}/erlang/man/man3/snmpa_error_report.* +%{_libdir}/erlang/man/man3/snmpa_local_db.* +%{_libdir}/erlang/man/man3/snmpa_mpd.* +%{_libdir}/erlang/man/man3/snmpa_network_interface.* +%{_libdir}/erlang/man/man3/snmpa_network_interface_filter.* +%{_libdir}/erlang/man/man3/snmpa_notification_delivery_info_receiver.* +%{_libdir}/erlang/man/man3/snmpa_notification_filter.* +%{_libdir}/erlang/man/man3/snmpa_supervisor.* +%{_libdir}/erlang/man/man3/snmpc.* +%{_libdir}/erlang/man/man3/snmp_community_mib.* +%{_libdir}/erlang/man/man3/snmp_framework_mib.* +%{_libdir}/erlang/man/man3/snmp_generic.* +%{_libdir}/erlang/man/man3/snmp_index.* +%{_libdir}/erlang/man/man3/snmpm.* +%{_libdir}/erlang/man/man3/snmpm_conf.* +%{_libdir}/erlang/man/man3/snmpm_mpd.* +%{_libdir}/erlang/man/man3/snmpm_network_interface.* +%{_libdir}/erlang/man/man3/snmpm_network_interface_filter.* +%{_libdir}/erlang/man/man3/snmpm_user.* +%{_libdir}/erlang/man/man3/snmp_notification_mib.* +%{_libdir}/erlang/man/man3/snmp_pdus.* +%{_libdir}/erlang/man/man3/snmp_standard_mib.* +%{_libdir}/erlang/man/man3/snmp_target_mib.* +%{_libdir}/erlang/man/man3/snmp_user_based_sm_mib.* +%{_libdir}/erlang/man/man3/snmp_view_based_acm_mib.* +%{_libdir}/erlang/man/man6/snmp.* +%{_libdir}/erlang/man/man7/INET-ADDRESS-MIB.* +%{_libdir}/erlang/man/man7/OTP-SNMPEA-MIB.* +%{_libdir}/erlang/man/man7/RFC1213-MIB.* +%{_libdir}/erlang/man/man7/SNMP-COMMUNITY-MIB.* +%{_libdir}/erlang/man/man7/SNMP-FRAMEWORK-MIB.* +%{_libdir}/erlang/man/man7/SNMP-MPD-MIB.* +%{_libdir}/erlang/man/man7/SNMP-NOTIFICATION-MIB.* +%{_libdir}/erlang/man/man7/SNMP-TARGET-MIB.* +%{_libdir}/erlang/man/man7/SNMP-USER-BASED-SM-MIB.* +%{_libdir}/erlang/man/man7/SNMP-USM-AES-MIB.* +%{_libdir}/erlang/man/man7/SNMPv2-MIB.* +%{_libdir}/erlang/man/man7/SNMPv2-TM.* +%{_libdir}/erlang/man/man7/SNMP-VIEW-BASED-ACM-MIB.* +%{_libdir}/erlang/man/man7/STANDARD-MIB.* %files ssh %defattr(-,root,root) %{_libdir}/erlang/lib/ssh-*/ +%{_libdir}/erlang/man/man3/ssh.* +%{_libdir}/erlang/man/man3/ssh_channel.* +%{_libdir}/erlang/man/man3/ssh_connection.* +%{_libdir}/erlang/man/man3/ssh_sftp.* +%{_libdir}/erlang/man/man3/ssh_sftpd.* %files ssl %defattr(-,root,root) @@ -1020,6 +1351,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/ssl-*/pkix %{_libdir}/erlang/lib/ssl-*/priv %{_libdir}/erlang/lib/ssl-*/src +%{_libdir}/erlang/man/man3/new_ssl.* +%{_libdir}/erlang/man/man3/ssl.* +%{_libdir}/erlang/man/man6/ssl.* %files stdlib %defattr(-,root,root) @@ -1027,19 +1361,91 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/stdlib-*/ebin %{_libdir}/erlang/lib/stdlib-*/include %{_libdir}/erlang/lib/stdlib-*/src +%{_libdir}/erlang/man/man3/array.* +%{_libdir}/erlang/man/man3/base64.* +%{_libdir}/erlang/man/man3/beam_lib.* +%{_libdir}/erlang/man/man3/c.* +%{_libdir}/erlang/man/man3/calendar.* +%{_libdir}/erlang/man/man3/dets.* +%{_libdir}/erlang/man/man3/dict.* +%{_libdir}/erlang/man/man3/digraph.* +%{_libdir}/erlang/man/man3/digraph_utils.* +%{_libdir}/erlang/man/man3/epp.* +%{_libdir}/erlang/man/man3/erl_eval.* +%{_libdir}/erlang/man/man3/erl_expand_records.* +%{_libdir}/erlang/man/man3/erl_id_trans.* +%{_libdir}/erlang/man/man3/erl_internal.* +%{_libdir}/erlang/man/man3/erl_lint.* +%{_libdir}/erlang/man/man3/erl_parse.* +%{_libdir}/erlang/man/man3/erl_pp.* +%{_libdir}/erlang/man/man3/erl_scan.* +%{_libdir}/erlang/man/man3/erl_tar.* +%{_libdir}/erlang/man/man3/ets.* +%{_libdir}/erlang/man/man3/file_sorter.* +%{_libdir}/erlang/man/man3/filelib.* +%{_libdir}/erlang/man/man3/filename.* +%{_libdir}/erlang/man/man3/gb_sets.* +%{_libdir}/erlang/man/man3/gb_trees.* +%{_libdir}/erlang/man/man3/gen_event.* +%{_libdir}/erlang/man/man3/gen_fsm.* +%{_libdir}/erlang/man/man3/gen_server.* +%{_libdir}/erlang/man/man3/io.* +%{_libdir}/erlang/man/man3/io_lib.* +%{_libdir}/erlang/man/man3/lib.* +%{_libdir}/erlang/man/man3/lists.* +%{_libdir}/erlang/man/man3/log_mf_h.* +%{_libdir}/erlang/man/man3/math.* +%{_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/random.* +%{_libdir}/erlang/man/man3/re.* +%{_libdir}/erlang/man/man3/regexp.* +%{_libdir}/erlang/man/man3/sets.* +%{_libdir}/erlang/man/man3/shell.* +%{_libdir}/erlang/man/man3/shell_default.* +%{_libdir}/erlang/man/man3/slave.* +%{_libdir}/erlang/man/man3/sofs.* +%{_libdir}/erlang/man/man3/string.* +%{_libdir}/erlang/man/man3/supervisor.* +%{_libdir}/erlang/man/man3/supervisor_bridge.* +%{_libdir}/erlang/man/man3/sys.* +%{_libdir}/erlang/man/man3/timer.* +%{_libdir}/erlang/man/man3/unicode.* +%{_libdir}/erlang/man/man3/zip.* +%{_libdir}/erlang/man/man6/stdlib.* %files syntax_tools %defattr(-,root,root) %dir %{_libdir}/erlang/lib/syntax_tools-*/ %{_libdir}/erlang/lib/syntax_tools-*/ebin +%{_libdir}/erlang/man/man3/epp_dodger.* +%{_libdir}/erlang/man/man3/erl_comment_scan.* +%{_libdir}/erlang/man/man3/erl_prettypr.* +%{_libdir}/erlang/man/man3/erl_recomment.* +%{_libdir}/erlang/man/man3/erl_syntax.* +%{_libdir}/erlang/man/man3/erl_syntax_lib.* +%{_libdir}/erlang/man/man3/erl_tidy.* +%{_libdir}/erlang/man/man3/igor.* +%{_libdir}/erlang/man/man3/prettypr.* %files test_server %defattr(-,root,root) %{_libdir}/erlang/lib/test_server-*/ +%{_libdir}/erlang/man/man3/test_server.* +%{_libdir}/erlang/man/man3/test_server_ctrl.* +%{_libdir}/erlang/man/man6/test_server.* %files toolbar %defattr(-,root,root) %{_libdir}/erlang/lib/toolbar-*/ +%{_libdir}/erlang/man/man3/toolbar.* %files tools %defattr(-,root,root) @@ -1049,10 +1455,21 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/tools-*/emacs %{_libdir}/erlang/lib/tools-*/priv %{_libdir}/erlang/lib/tools-*/src +%{_libdir}/erlang/man/man3/cover.* +%{_libdir}/erlang/man/man3/cprof.* +%{_libdir}/erlang/man/man3/eprof.* +%{_libdir}/erlang/man/man3/erlang_mode.* +%{_libdir}/erlang/man/man3/fprof.* +%{_libdir}/erlang/man/man3/instrument.* +%{_libdir}/erlang/man/man3/lcnt.* +%{_libdir}/erlang/man/man3/make.* +%{_libdir}/erlang/man/man3/tags.* +%{_libdir}/erlang/man/man3/xref.* %files tv %defattr(-,root,root) %{_libdir}/erlang/lib/tv-*/ +%{_libdir}/erlang/man/man3/tv.* %files typer %defattr(-,root,root) @@ -1061,6 +1478,8 @@ rm -rf $RPM_BUILD_ROOT %files webtool %defattr(-,root,root) %{_libdir}/erlang/lib/webtool-*/ +%{_libdir}/erlang/man/man1/start_webtool.* +%{_libdir}/erlang/man/man3/webtool.* %files wx %defattr(-,root,root) @@ -1069,17 +1488,249 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/wx-*/include %{_libdir}/erlang/lib/wx-*/priv %{_libdir}/erlang/lib/wx-*/src +%{_libdir}/erlang/man/man3/gl.* +%{_libdir}/erlang/man/man3/glu.* +%{_libdir}/erlang/man/man3/wx.* +%{_libdir}/erlang/man/man3/wx_misc.* +%{_libdir}/erlang/man/man3/wx_object.* +%{_libdir}/erlang/man/man3/wxAcceleratorEntry.* +%{_libdir}/erlang/man/man3/wxAcceleratorTable.* +%{_libdir}/erlang/man/man3/wxArtProvider.* +%{_libdir}/erlang/man/man3/wxAuiDockArt.* +%{_libdir}/erlang/man/man3/wxAuiManager.* +%{_libdir}/erlang/man/man3/wxAuiManagerEvent.* +%{_libdir}/erlang/man/man3/wxAuiNotebook.* +%{_libdir}/erlang/man/man3/wxAuiNotebookEvent.* +%{_libdir}/erlang/man/man3/wxAuiPaneInfo.* +%{_libdir}/erlang/man/man3/wxAuiTabArt.* +%{_libdir}/erlang/man/man3/wxBitmap.* +%{_libdir}/erlang/man/man3/wxBitmapButton.* +%{_libdir}/erlang/man/man3/wxBitmapDataObject.* +%{_libdir}/erlang/man/man3/wxBoxSizer.* +%{_libdir}/erlang/man/man3/wxBrush.* +%{_libdir}/erlang/man/man3/wxBufferedDC.* +%{_libdir}/erlang/man/man3/wxBufferedPaintDC.* +%{_libdir}/erlang/man/man3/wxButton.* +%{_libdir}/erlang/man/man3/wxCalendarCtrl.* +%{_libdir}/erlang/man/man3/wxCalendarDateAttr.* +%{_libdir}/erlang/man/man3/wxCalendarEvent.* +%{_libdir}/erlang/man/man3/wxCaret.* +%{_libdir}/erlang/man/man3/wxCheckBox.* +%{_libdir}/erlang/man/man3/wxCheckListBox.* +%{_libdir}/erlang/man/man3/wxChildFocusEvent.* +%{_libdir}/erlang/man/man3/wxChoice.* +%{_libdir}/erlang/man/man3/wxChoicebook.* +%{_libdir}/erlang/man/man3/wxClientDC.* +%{_libdir}/erlang/man/man3/wxClipboard.* +%{_libdir}/erlang/man/man3/wxCloseEvent.* +%{_libdir}/erlang/man/man3/wxColourData.* +%{_libdir}/erlang/man/man3/wxColourDialog.* +%{_libdir}/erlang/man/man3/wxColourPickerCtrl.* +%{_libdir}/erlang/man/man3/wxColourPickerEvent.* +%{_libdir}/erlang/man/man3/wxComboBox.* +%{_libdir}/erlang/man/man3/wxCommandEvent.* +%{_libdir}/erlang/man/man3/wxContextMenuEvent.* +%{_libdir}/erlang/man/man3/wxControl.* +%{_libdir}/erlang/man/man3/wxControlWithItems.* +%{_libdir}/erlang/man/man3/wxCursor.* +%{_libdir}/erlang/man/man3/wxDataObject.* +%{_libdir}/erlang/man/man3/wxDateEvent.* +%{_libdir}/erlang/man/man3/wxDatePickerCtrl.* +%{_libdir}/erlang/man/man3/wxDC.* +%{_libdir}/erlang/man/man3/wxDialog.* +%{_libdir}/erlang/man/man3/wxDirDialog.* +%{_libdir}/erlang/man/man3/wxDirPickerCtrl.* +%{_libdir}/erlang/man/man3/wxDisplayChangedEvent.* +%{_libdir}/erlang/man/man3/wxEraseEvent.* +%{_libdir}/erlang/man/man3/wxEvent.* +%{_libdir}/erlang/man/man3/wxEvtHandler.* +%{_libdir}/erlang/man/man3/wxFileDataObject.* +%{_libdir}/erlang/man/man3/wxFileDialog.* +%{_libdir}/erlang/man/man3/wxFileDirPickerEvent.* +%{_libdir}/erlang/man/man3/wxFilePickerCtrl.* +%{_libdir}/erlang/man/man3/wxFindReplaceData.* +%{_libdir}/erlang/man/man3/wxFindReplaceDialog.* +%{_libdir}/erlang/man/man3/wxFlexGridSizer.* +%{_libdir}/erlang/man/man3/wxFocusEvent.* +%{_libdir}/erlang/man/man3/wxFont.* +%{_libdir}/erlang/man/man3/wxFontData.* +%{_libdir}/erlang/man/man3/wxFontDialog.* +%{_libdir}/erlang/man/man3/wxFontPickerCtrl.* +%{_libdir}/erlang/man/man3/wxFontPickerEvent.* +%{_libdir}/erlang/man/man3/wxFrame.* +%{_libdir}/erlang/man/man3/wxGauge.* +%{_libdir}/erlang/man/man3/wxGBSizerItem.* +%{_libdir}/erlang/man/man3/wxGenericDirCtrl.* +%{_libdir}/erlang/man/man3/wxGLCanvas.* +%{_libdir}/erlang/man/man3/wxGraphicsBrush.* +%{_libdir}/erlang/man/man3/wxGraphicsContext.* +%{_libdir}/erlang/man/man3/wxGraphicsFont.* +%{_libdir}/erlang/man/man3/wxGraphicsMatrix.* +%{_libdir}/erlang/man/man3/wxGraphicsObject.* +%{_libdir}/erlang/man/man3/wxGraphicsPath.* +%{_libdir}/erlang/man/man3/wxGraphicsPen.* +%{_libdir}/erlang/man/man3/wxGraphicsRenderer.* +%{_libdir}/erlang/man/man3/wxGrid.* +%{_libdir}/erlang/man/man3/wxGridBagSizer.* +%{_libdir}/erlang/man/man3/wxGridCellAttr.* +%{_libdir}/erlang/man/man3/wxGridCellBoolEditor.* +%{_libdir}/erlang/man/man3/wxGridCellBoolRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellChoiceEditor.* +%{_libdir}/erlang/man/man3/wxGridCellEditor.* +%{_libdir}/erlang/man/man3/wxGridCellFloatEditor.* +%{_libdir}/erlang/man/man3/wxGridCellFloatRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellNumberEditor.* +%{_libdir}/erlang/man/man3/wxGridCellNumberRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellStringRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellTextEditor.* +%{_libdir}/erlang/man/man3/wxGridEvent.* +%{_libdir}/erlang/man/man3/wxGridSizer.* +%{_libdir}/erlang/man/man3/wxHelpEvent.* +%{_libdir}/erlang/man/man3/wxHtmlEasyPrinting.* +%{_libdir}/erlang/man/man3/wxHtmlLinkEvent.* +%{_libdir}/erlang/man/man3/wxHtmlWindow.* +%{_libdir}/erlang/man/man3/wxIcon.* +%{_libdir}/erlang/man/man3/wxIconBundle.* +%{_libdir}/erlang/man/man3/wxIconizeEvent.* +%{_libdir}/erlang/man/man3/wxIdleEvent.* +%{_libdir}/erlang/man/man3/wxImage.* +%{_libdir}/erlang/man/man3/wxImageList.* +%{_libdir}/erlang/man/man3/wxJoystickEvent.* +%{_libdir}/erlang/man/man3/wxKeyEvent.* +%{_libdir}/erlang/man/man3/wxLayoutAlgorithm.* +%{_libdir}/erlang/man/man3/wxListbook.* +%{_libdir}/erlang/man/man3/wxListBox.* +%{_libdir}/erlang/man/man3/wxListCtrl.* +%{_libdir}/erlang/man/man3/wxListEvent.* +%{_libdir}/erlang/man/man3/wxListItem.* +%{_libdir}/erlang/man/man3/wxListView.* +%{_libdir}/erlang/man/man3/wxLogNull.* +%{_libdir}/erlang/man/man3/wxMask.* +%{_libdir}/erlang/man/man3/wxMaximizeEvent.* +%{_libdir}/erlang/man/man3/wxMDIChildFrame.* +%{_libdir}/erlang/man/man3/wxMDIClientWindow.* +%{_libdir}/erlang/man/man3/wxMDIParentFrame.* +%{_libdir}/erlang/man/man3/wxMemoryDC.* +%{_libdir}/erlang/man/man3/wxMenu.* +%{_libdir}/erlang/man/man3/wxMenuBar.* +%{_libdir}/erlang/man/man3/wxMenuEvent.* +%{_libdir}/erlang/man/man3/wxMenuItem.* +%{_libdir}/erlang/man/man3/wxMessageDialog.* +%{_libdir}/erlang/man/man3/wxMiniFrame.* +%{_libdir}/erlang/man/man3/wxMirrorDC.* +%{_libdir}/erlang/man/man3/wxMouseCaptureChangedEvent.* +%{_libdir}/erlang/man/man3/wxMouseEvent.* +%{_libdir}/erlang/man/man3/wxMoveEvent.* +%{_libdir}/erlang/man/man3/wxMultiChoiceDialog.* +%{_libdir}/erlang/man/man3/wxNavigationKeyEvent.* +%{_libdir}/erlang/man/man3/wxNcPaintEvent.* +%{_libdir}/erlang/man/man3/wxNotebook.* +%{_libdir}/erlang/man/man3/wxNotebookEvent.* +%{_libdir}/erlang/man/man3/wxNotifyEvent.* +%{_libdir}/erlang/man/man3/wxPageSetupDialog.* +%{_libdir}/erlang/man/man3/wxPageSetupDialogData.* +%{_libdir}/erlang/man/man3/wxPaintDC.* +%{_libdir}/erlang/man/man3/wxPaintEvent.* +%{_libdir}/erlang/man/man3/wxPalette.* +%{_libdir}/erlang/man/man3/wxPaletteChangedEvent.* +%{_libdir}/erlang/man/man3/wxPanel.* +%{_libdir}/erlang/man/man3/wxPasswordEntryDialog.* +%{_libdir}/erlang/man/man3/wxPen.* +%{_libdir}/erlang/man/man3/wxPickerBase.* +%{_libdir}/erlang/man/man3/wxPostScriptDC.* +%{_libdir}/erlang/man/man3/wxPreviewCanvas.* +%{_libdir}/erlang/man/man3/wxPreviewControlBar.* +%{_libdir}/erlang/man/man3/wxPreviewFrame.* +%{_libdir}/erlang/man/man3/wxPrintData.* +%{_libdir}/erlang/man/man3/wxPrintDialog.* +%{_libdir}/erlang/man/man3/wxPrintDialogData.* +%{_libdir}/erlang/man/man3/wxPrinter.* +%{_libdir}/erlang/man/man3/wxPrintout.* +%{_libdir}/erlang/man/man3/wxPrintPreview.* +%{_libdir}/erlang/man/man3/wxProgressDialog.* +%{_libdir}/erlang/man/man3/wxQueryNewPaletteEvent.* +%{_libdir}/erlang/man/man3/wxRadioBox.* +%{_libdir}/erlang/man/man3/wxRadioButton.* +%{_libdir}/erlang/man/man3/wxRegion.* +%{_libdir}/erlang/man/man3/wxSashEvent.* +%{_libdir}/erlang/man/man3/wxSashLayoutWindow.* +%{_libdir}/erlang/man/man3/wxSashWindow.* +%{_libdir}/erlang/man/man3/wxScreenDC.* +%{_libdir}/erlang/man/man3/wxScrollBar.* +%{_libdir}/erlang/man/man3/wxScrolledWindow.* +%{_libdir}/erlang/man/man3/wxScrollEvent.* +%{_libdir}/erlang/man/man3/wxScrollWinEvent.* +%{_libdir}/erlang/man/man3/wxSetCursorEvent.* +%{_libdir}/erlang/man/man3/wxShowEvent.* +%{_libdir}/erlang/man/man3/wxSingleChoiceDialog.* +%{_libdir}/erlang/man/man3/wxSizeEvent.* +%{_libdir}/erlang/man/man3/wxSizer.* +%{_libdir}/erlang/man/man3/wxSizerFlags.* +%{_libdir}/erlang/man/man3/wxSizerItem.* +%{_libdir}/erlang/man/man3/wxSlider.* +%{_libdir}/erlang/man/man3/wxSpinButton.* +%{_libdir}/erlang/man/man3/wxSpinCtrl.* +%{_libdir}/erlang/man/man3/wxSpinEvent.* +%{_libdir}/erlang/man/man3/wxSplashScreen.* +%{_libdir}/erlang/man/man3/wxSplitterEvent.* +%{_libdir}/erlang/man/man3/wxSplitterWindow.* +%{_libdir}/erlang/man/man3/wxStaticBitmap.* +%{_libdir}/erlang/man/man3/wxStaticBox.* +%{_libdir}/erlang/man/man3/wxStaticBoxSizer.* +%{_libdir}/erlang/man/man3/wxStaticLine.* +%{_libdir}/erlang/man/man3/wxStaticText.* +%{_libdir}/erlang/man/man3/wxStatusBar.* +%{_libdir}/erlang/man/man3/wxStdDialogButtonSizer.* +%{_libdir}/erlang/man/man3/wxStyledTextCtrl.* +%{_libdir}/erlang/man/man3/wxStyledTextEvent.* +%{_libdir}/erlang/man/man3/wxSysColourChangedEvent.* +%{_libdir}/erlang/man/man3/wxTextAttr.* +%{_libdir}/erlang/man/man3/wxTextCtrl.* +%{_libdir}/erlang/man/man3/wxTextDataObject.* +%{_libdir}/erlang/man/man3/wxTextEntryDialog.* +%{_libdir}/erlang/man/man3/wxToggleButton.* +%{_libdir}/erlang/man/man3/wxToolBar.* +%{_libdir}/erlang/man/man3/wxToolbook.* +%{_libdir}/erlang/man/man3/wxToolTip.* +%{_libdir}/erlang/man/man3/wxTopLevelWindow.* +%{_libdir}/erlang/man/man3/wxTreebook.* +%{_libdir}/erlang/man/man3/wxTreeCtrl.* +%{_libdir}/erlang/man/man3/wxTreeEvent.* +%{_libdir}/erlang/man/man3/wxUpdateUIEvent.* +%{_libdir}/erlang/man/man3/wxWindow.* +%{_libdir}/erlang/man/man3/wxWindowCreateEvent.* +%{_libdir}/erlang/man/man3/wxWindowDC.* +%{_libdir}/erlang/man/man3/wxWindowDestroyEvent.* +%{_libdir}/erlang/man/man3/wxXmlResource.* %files xmerl %defattr(-,root,root) %{_libdir}/erlang/lib/xmerl-*/ +%{_libdir}/erlang/man/man3/xmerl.* +%{_libdir}/erlang/man/man3/xmerl_eventp.* +%{_libdir}/erlang/man/man3/xmerl_sax_parser.* +%{_libdir}/erlang/man/man3/xmerl_scan.* +%{_libdir}/erlang/man/man3/xmerl_xpath.* +%{_libdir}/erlang/man/man3/xmerl_xs.* +%{_libdir}/erlang/man/man3/xmerl_xsd.* -%post -%{_libdir}/erlang/Install -minimal -cross %{_libdir}/erlang >/dev/null 2>/dev/null +%changelog +* Wed Apr 28 2010 Peter Lemenkov - R13B-04.9 +- Added missing files, necessary for emacs (see rhbz #585349) +- Patches rebased +* Tue Apr 27 2010 Peter Lemenkov - R13B-04.8 +- Added missing BuildRequires libxslt (for building docs) +- Removed %%post script completely (resolves rhbz #586428) +- Since now both docs and man-pages are built from sources +- No need to manually create symlinks in %%{_bindir} + +* Mon Apr 26 2010 Peter Lemenkov - R13B-04.7 +- Build with erlang-rpm-macros +- Man-files are packed with packages, they belong to -%changelog * Mon Apr 26 2010 Peter Lemenkov - R13B-04.6 - Made erlang-rpm-macros as separate package - Fix error while installing erlang-rpm-macros diff --git a/import.log b/import.log index 97016fb..69b579b 100644 --- a/import.log +++ b/import.log @@ -4,3 +4,4 @@ erlang-R13B-04_3_fc12:F-12:erlang-R13B-04.3.fc12.src.rpm:1271239367 erlang-R13B-04_4_fc12:F-12:erlang-R13B-04.4.fc12.src.rpm:1271523892 erlang-R13B-04_5_fc12:F-12:erlang-R13B-04.5.fc12.src.rpm:1272271343 erlang-R13B-04_6_fc12:F-12:erlang-R13B-04.6.fc12.src.rpm:1272303739 +erlang-R13B-04_9_fc12:F-12:erlang-R13B-04.9.fc12.src.rpm:1272528494 diff --git a/otp-0001-Do-not-format-man-pages.patch b/otp-0001-Do-not-format-man-pages.patch index 5f9594f..632408b 100644 --- a/otp-0001-Do-not-format-man-pages.patch +++ b/otp-0001-Do-not-format-man-pages.patch @@ -1,7 +1,7 @@ From 80fd602b5cd9f4aaa7b6bd95e174708e27601db5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 25 Feb 2010 16:45:28 +0300 -Subject: [PATCH 1/9] Do not format man-pages +Subject: [PATCH 1/7] Do not format man-pages Signed-off-by: Peter Lemenkov --- diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 0293073..1da9a67 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -1,7 +1,7 @@ From 2e10f728feb56ea96b2832999a8c34f1f19646bc Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 25 Feb 2010 16:57:43 +0300 -Subject: [PATCH 2/9] Remove rpath +Subject: [PATCH 2/7] Remove rpath Signed-off-by: Peter Lemenkov --- diff --git a/otp-0004-Fix-shared-libraries-installation.patch b/otp-0004-Fix-shared-libraries-installation.patch new file mode 100644 index 0000000..f828169 --- /dev/null +++ b/otp-0004-Fix-shared-libraries-installation.patch @@ -0,0 +1,58 @@ +From edaced375235a006c87a3e15b8b17e9bc6dbb923 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 15 Apr 2010 13:31:36 +0400 +Subject: [PATCH 4/7] Fix shared libraries installation + +Several shared libraries (asn1_erl_drv.so, megaco_flex_scanner_drv_mt.so, +megaco_flex_scanner_drv.so, wxe_driver.so) were installed as data files +previously. + +Signed-off-by: Peter Lemenkov +--- + lib/asn1/c_src/Makefile | 2 +- + lib/megaco/src/flex/Makefile.in | 2 +- + lib/wx/c_src/Makefile.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile +index 906c513..9e9cb18 100644 +--- a/lib/asn1/c_src/Makefile ++++ b/lib/asn1/c_src/Makefile +@@ -124,7 +124,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/lib +- $(INSTALL_DATA) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib + $(INSTALL_DIR) $(RELSYSDIR)/c_src + $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src + +diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in +index 6ce9b34..5af651d 100644 +--- a/lib/megaco/src/flex/Makefile.in ++++ b/lib/megaco/src/flex/Makefile.in +@@ -280,7 +280,7 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) + $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex +- $(INSTALL_DATA) $(SOLIBS) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib + endif + + +diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in +index 5a0b4ce..8710641 100644 +--- a/lib/wx/c_src/Makefile.in ++++ b/lib/wx/c_src/Makefile.in +@@ -167,7 +167,7 @@ release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/$(SYS_TYPE) + $(INSTALL_DATA) ../priv/erlang-logo32.png $(RELSYSDIR)/priv/ + $(INSTALL_DATA) ../priv/erlang-logo64.png $(RELSYSDIR)/priv/ +- $(INSTALL_DATA) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) ++ $(INSTALL_PROGRAM) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) + + release_docs_spec: + +-- +1.6.6.1 + diff --git a/otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch b/otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch new file mode 100644 index 0000000..4f55214 --- /dev/null +++ b/otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch @@ -0,0 +1,35 @@ +From 3475d4f155dc4bc2919e371e614fee81f01e87d5 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Fri, 16 Apr 2010 21:13:47 +0400 +Subject: [PATCH 5/7] Fix for dlopening libGL and libGLU + +Signed-off-by: Peter Lemenkov +--- + lib/wx/c_src/wxe_gl.cpp | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp +index 63dd68f..36bf15f 100644 +--- a/lib/wx/c_src/wxe_gl.cpp ++++ b/lib/wx/c_src/wxe_gl.cpp +@@ -81,7 +81,7 @@ int initOpenGL() + WCHAR * DLName = wxT("opengl32.dll"); + HMODULE LIBhandle = LoadLibrary(DLName); + #else +- char * DLName = (char *) "libGL.so"; ++ char * DLName = (char *) "libGL.so.1"; + void * LIBhandle = dlopen(DLName, RTLD_LAZY); + #endif + // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); +@@ -132,7 +132,7 @@ int initOpenGL() + DLName = wxT("glu32.dll"); + LIBhandle = LoadLibrary(DLName); + #else +- DLName = (char *) "libGLU.so"; ++ DLName = (char *) "libGLU.so.1"; + LIBhandle = dlopen(DLName, RTLD_LAZY); + #endif + // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); +-- +1.6.6.1 + diff --git a/otp-0006-Fix-check-for-compile-workspace-overflow.patch b/otp-0006-Fix-check-for-compile-workspace-overflow.patch new file mode 100644 index 0000000..37363de --- /dev/null +++ b/otp-0006-Fix-check-for-compile-workspace-overflow.patch @@ -0,0 +1,55 @@ +From 400034faee44b65a5e33014e7ce4edcfcfba870f Mon Sep 17 00:00:00 2001 +From: Michael Santos +Date: Thu, 18 Mar 2010 20:08:10 -0400 +Subject: [PATCH 6/7] Fix check for compile workspace overflow + +Patch from: +http://vcs.pcre.org/viewvc/code/trunk/pcre_compile.c?r1=504&r2=505&view=patch + +Test case: +N = 819, re:compile([lists:duplicate(N, $(), lists:duplicate(N, $))]). + +Compiling large regular expressions could overflow the workspace +buffer. Modify the test to check for a value smaller than the buffer +size. +--- + erts/emulator/pcre/pcre_compile.c | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c +index 2974336..9508c5a 100644 +--- a/erts/emulator/pcre/pcre_compile.c ++++ b/erts/emulator/pcre/pcre_compile.c +@@ -92,6 +92,11 @@ is 4 there is plenty of room. */ + + #define COMPILE_WORK_SIZE (4096) + ++/* The overrun tests check for a slightly smaller size so that they detect the ++overrun before it actually does run off the end of the data block. */ ++ ++#define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100) ++ + + /* Table for handling escaped characters in the range '0'-'z'. Positive returns + are simple data values; negative values are for special things like \d and so +@@ -2445,7 +2450,7 @@ for (;; ptr++) + #ifdef DEBUG + if (code > cd->hwm) cd->hwm = code; /* High water info */ + #endif +- if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */ ++ if (code > cd->start_workspace + WORK_SIZE_CHECK) /* Check for overrun */ + { + *errorcodeptr = ERR52; + goto FAILED; +@@ -2494,7 +2499,7 @@ for (;; ptr++) + /* In the real compile phase, just check the workspace used by the forward + reference list. */ + +- else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE) ++ else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK) + { + *errorcodeptr = ERR52; + goto FAILED; +-- +1.6.6.1 + diff --git a/otp-0006-Fix-shared-libraries-installation.patch b/otp-0006-Fix-shared-libraries-installation.patch deleted file mode 100644 index 2df3cb4..0000000 --- a/otp-0006-Fix-shared-libraries-installation.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0c963550412174a4c4fe64aa7f70189998abef41 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Thu, 15 Apr 2010 13:31:36 +0400 -Subject: [PATCH 6/9] Fix shared libraries installation - -Several shared libraries (asn1_erl_drv.so, megaco_flex_scanner_drv_mt.so, -megaco_flex_scanner_drv.so, wxe_driver.so) were installed as data files -previously. - -Signed-off-by: Peter Lemenkov ---- - lib/asn1/c_src/Makefile | 2 +- - lib/megaco/src/flex/Makefile.in | 2 +- - lib/wx/c_src/Makefile.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile -index 906c513..9e9cb18 100644 ---- a/lib/asn1/c_src/Makefile -+++ b/lib/asn1/c_src/Makefile -@@ -124,7 +124,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/priv/lib -- $(INSTALL_DATA) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib -+ $(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib - $(INSTALL_DIR) $(RELSYSDIR)/c_src - $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src - -diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index 6ce9b34..5af651d 100644 ---- a/lib/megaco/src/flex/Makefile.in -+++ b/lib/megaco/src/flex/Makefile.in -@@ -280,7 +280,7 @@ release_spec: opt - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) - $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex -- $(INSTALL_DATA) $(SOLIBS) $(RELSYSDIR)/priv/lib -+ $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib - endif - - -diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in -index 5a0b4ce..8710641 100644 ---- a/lib/wx/c_src/Makefile.in -+++ b/lib/wx/c_src/Makefile.in -@@ -167,7 +167,7 @@ release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/priv/$(SYS_TYPE) - $(INSTALL_DATA) ../priv/erlang-logo32.png $(RELSYSDIR)/priv/ - $(INSTALL_DATA) ../priv/erlang-logo64.png $(RELSYSDIR)/priv/ -- $(INSTALL_DATA) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) -+ $(INSTALL_PROGRAM) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) - - release_docs_spec: - --- -1.6.6.1 - diff --git a/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch b/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch deleted file mode 100644 index 5e78c4a..0000000 --- a/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6ffccff36e0d94cba0412cf3a29769b4a19d3be3 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Fri, 16 Apr 2010 21:13:47 +0400 -Subject: [PATCH 7/9] Fix for dlopening libGL and libGLU - -Signed-off-by: Peter Lemenkov ---- - lib/wx/c_src/wxe_gl.cpp | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp -index 63dd68f..36bf15f 100644 ---- a/lib/wx/c_src/wxe_gl.cpp -+++ b/lib/wx/c_src/wxe_gl.cpp -@@ -81,7 +81,7 @@ int initOpenGL() - WCHAR * DLName = wxT("opengl32.dll"); - HMODULE LIBhandle = LoadLibrary(DLName); - #else -- char * DLName = (char *) "libGL.so"; -+ char * DLName = (char *) "libGL.so.1"; - void * LIBhandle = dlopen(DLName, RTLD_LAZY); - #endif - // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); -@@ -132,7 +132,7 @@ int initOpenGL() - DLName = wxT("glu32.dll"); - LIBhandle = LoadLibrary(DLName); - #else -- DLName = (char *) "libGLU.so"; -+ DLName = (char *) "libGLU.so.1"; - LIBhandle = dlopen(DLName, RTLD_LAZY); - #endif - // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); --- -1.6.6.1 - diff --git a/otp-0007-Install-missing-emacs-files.patch b/otp-0007-Install-missing-emacs-files.patch new file mode 100644 index 0000000..389c517 --- /dev/null +++ b/otp-0007-Install-missing-emacs-files.patch @@ -0,0 +1,28 @@ +From 09e0f9ec22f680c759feea2e90913128ce2a249d Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Wed, 28 Apr 2010 14:35:59 +0400 +Subject: [PATCH 7/7] Install missing emacs files + +Signed-off-by: Peter Lemenkov +--- + lib/tools/emacs/Makefile | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/lib/tools/emacs/Makefile b/lib/tools/emacs/Makefile +index 7249263..17978de 100644 +--- a/lib/tools/emacs/Makefile ++++ b/lib/tools/emacs/Makefile +@@ -38,7 +38,10 @@ MAN_FILES= \ + + EMACS_FILES= \ + erlang-start \ ++ erlang-skels-old \ ++ erlang-skels \ + erlang-eunit \ ++ erlang_appwiz \ + erlang + + README_FILES= README +-- +1.6.6.1 + diff --git a/otp-0008-Fix-check-for-compile-workspace-overflow.patch b/otp-0008-Fix-check-for-compile-workspace-overflow.patch deleted file mode 100644 index 2e34451..0000000 --- a/otp-0008-Fix-check-for-compile-workspace-overflow.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d496ce48940411976617b66a5c941c78313cb78c Mon Sep 17 00:00:00 2001 -From: Michael Santos -Date: Thu, 18 Mar 2010 20:08:10 -0400 -Subject: [PATCH 8/9] Fix check for compile workspace overflow - -Patch from: -http://vcs.pcre.org/viewvc/code/trunk/pcre_compile.c?r1=504&r2=505&view=patch - -Test case: -N = 819, re:compile([lists:duplicate(N, $(), lists:duplicate(N, $))]). - -Compiling large regular expressions could overflow the workspace -buffer. Modify the test to check for a value smaller than the buffer -size. ---- - erts/emulator/pcre/pcre_compile.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c -index 2974336..9508c5a 100644 ---- a/erts/emulator/pcre/pcre_compile.c -+++ b/erts/emulator/pcre/pcre_compile.c -@@ -92,6 +92,11 @@ is 4 there is plenty of room. */ - - #define COMPILE_WORK_SIZE (4096) - -+/* The overrun tests check for a slightly smaller size so that they detect the -+overrun before it actually does run off the end of the data block. */ -+ -+#define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100) -+ - - /* Table for handling escaped characters in the range '0'-'z'. Positive returns - are simple data values; negative values are for special things like \d and so -@@ -2445,7 +2450,7 @@ for (;; ptr++) - #ifdef DEBUG - if (code > cd->hwm) cd->hwm = code; /* High water info */ - #endif -- if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */ -+ if (code > cd->start_workspace + WORK_SIZE_CHECK) /* Check for overrun */ - { - *errorcodeptr = ERR52; - goto FAILED; -@@ -2494,7 +2499,7 @@ for (;; ptr++) - /* In the real compile phase, just check the workspace used by the forward - reference list. */ - -- else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE) -+ else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK) - { - *errorcodeptr = ERR52; - goto FAILED; --- -1.6.6.1 - diff --git a/sources b/sources index 9207cc0..2216c4f 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -d69ce51bfabbdd0808461d86dfc95689 otp_doc_html_R13B04.tar.gz -681aaef70affc64743f4e8c0675034af otp_doc_man_R13B04.tar.gz ca6da4921e438891967900aa6a084341 otp_src_R13B04.tar.gz -- cgit From c4f14d03ec3540011fbc620decc0e18bc27929c4 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 29 Apr 2010 08:08:36 +0000 Subject: Added autogenerated deps, fixed install of emacs files and much more --- .cvsignore | 2 - erlang.spec | 775 +++++++++++++++++++-- import.log | 1 + otp-0001-Do-not-format-man-pages.patch | 2 +- otp-0002-Remove-rpath.patch | 2 +- otp-0004-Fix-shared-libraries-installation.patch | 58 ++ otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch | 35 + ...-Fix-check-for-compile-workspace-overflow.patch | 55 ++ otp-0006-Fix-shared-libraries-installation.patch | 58 -- otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch | 35 - otp-0007-Install-missing-emacs-files.patch | 28 + ...-Fix-check-for-compile-workspace-overflow.patch | 55 -- sources | 2 - 13 files changed, 892 insertions(+), 216 deletions(-) create mode 100644 otp-0004-Fix-shared-libraries-installation.patch create mode 100644 otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch create mode 100644 otp-0006-Fix-check-for-compile-workspace-overflow.patch delete mode 100644 otp-0006-Fix-shared-libraries-installation.patch delete mode 100644 otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch create mode 100644 otp-0007-Install-missing-emacs-files.patch delete mode 100644 otp-0008-Fix-check-for-compile-workspace-overflow.patch diff --git a/.cvsignore b/.cvsignore index 697a4fc..ae1a587 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -otp_doc_html_R13B04.tar.gz -otp_doc_man_R13B04.tar.gz otp_src_R13B04.tar.gz diff --git a/erlang.spec b/erlang.spec index dc4e6d2..c59a8ce 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,42 +3,45 @@ %define ver R13B %define rel 04 -Name: erlang -Version: %{ver} -Release: %{rel}.6%{?dist} -Summary: General-purpose programming language and runtime environment - -Group: Development/Languages -License: ERPL -URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_%{ver}%{rel}.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_%{ver}%{rel}.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_%{ver}%{rel}.tar.gz +Name: erlang +Version: %{ver} +Release: %{rel}.9%{?dist} +Summary: General-purpose programming language and runtime environment + +Group: Development/Languages +License: ERPL +URL: http://www.erlang.org +Source0: http://www.erlang.org/download/otp_src_%{ver}%{rel}.tar.gz Source3: erlang-find-provides.escript Source4: erlang-find-provides.sh Source5: erlang-find-requires.escript Source6: erlang-find-requires.sh Source7: macros.erlang # TODO this patch needs rebase against current tree -Patch0: otp-links.patch +Patch0: otp-links.patch # Fedora-specific Patch1: otp-0001-Do-not-format-man-pages.patch # Fedora-specific Patch2: otp-0002-Remove-rpath.patch # Upstreamed -Patch6: otp-0006-Fix-shared-libraries-installation.patch +Patch4: otp-0004-Fix-shared-libraries-installation.patch # Fedora-specific -Patch7: otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch +Patch5: otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch # Upstreamed -Patch8: otp-0008-Fix-check-for-compile-workspace-overflow.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch6: otp-0006-Fix-check-for-compile-workspace-overflow.patch +# Install accidentally forgotten emacs files (see rhbz #585349) (already fixed upstream) +Patch7: otp-0007-Install-missing-emacs-files.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel -BuildRequires: openssl-devel +BuildRequires: openssl-devel BuildRequires: zlib-devel -BuildRequires: flex +BuildRequires: flex BuildRequires: m4 BuildRequires: fop +BuildRequires: libxslt +# Required for erlang-rpm-macros +BuildRequires: erlang Requires: erlang-appmon = %{version}-%{release} Requires: erlang-asn1 = %{version}-%{release} @@ -50,7 +53,7 @@ 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-cosTransactions = %{version}-%{release} Requires: erlang-crypto = %{version}-%{release} Requires: erlang-debugger = %{version}-%{release} Requires: erlang-dialyzer = %{version}-%{release} @@ -194,13 +197,14 @@ Obsoletes: %{name} < R13B-04.5 %description cosTime Orber OMG Timer and TimerEvent Service. -%package cosTransaction +%package cosTransactions Summary: Orber OMG Transaction Service Group: Development/Languages Requires: %{name}-erts = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 +Obsoletes: %{name}-cosTransaction < R13B-04.7 -%description cosTransaction +%description cosTransactions Orber OMG Transaction Service. %package crypto @@ -234,6 +238,7 @@ A DIscrepany AnaLYZer for ERlang programs. Summary: Erlang documentation Group: Development/Languages BuildArch: noarch +Requires: %{name} = %{version}-%{release} Obsoletes: %{name}-doc < R13B-04.4 %description doc @@ -647,9 +652,10 @@ Provides support for XML 1.0. %setup -q -n otp_src_%{ver}%{rel} %patch1 -p1 -b .do_not_format_manpages %patch2 -p1 -b .rpath -%patch6 -p1 -b .fix_shared_lib_install -%patch7 -p1 -b .dlopen_opengl_libs -%patch8 -p1 -b .pcre_overflow +%patch4 -p1 -b .fix_shared_lib_install +%patch5 -p1 -b .dlopen_opengl_libs +%patch6 -p1 -b .pcre_overflow +%patch7 -p1 -b .missing_emacs_files # remove shipped zlib sources rm -f erts/emulator/zlib/*.[ch] @@ -661,11 +667,13 @@ CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enabl CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib %endif make +make docs %install rm -rf $RPM_BUILD_ROOT -make INSTALL_PREFIX=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT install-docs # fix 0775 permission on some directories find $RPM_BUILD_ROOT%{_libdir}/erlang -type d -perm 0775 | xargs chmod 755 @@ -676,26 +684,32 @@ chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist/src/Ma chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/Makefile chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/src/Makefile -# install additional doc files -mkdir -p erlang_doc -tar -C erlang_doc -zxf %{SOURCE1} - -# install man-pages -tar -C $RPM_BUILD_ROOT%{_libdir}/erlang -zxf %{SOURCE2} -gzip $RPM_BUILD_ROOT%{_libdir}/erlang/man/man*/* - -# make links to binaries -mkdir -p $RPM_BUILD_ROOT%{_bindir} -cd $RPM_BUILD_ROOT%{_bindir} -for file in erl erlc escript dialyzer -do - ln -sf ../%{_lib}/erlang/bin/$file . -done - -# Remove batch files intended to use on one proprietary OS. +# Relocate doc-files into the proper directory +mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib +pushd . +cd $RPM_BUILD_ROOT%{_libdir}/erlang +mv -v doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +for i in erts-* ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/$i ; done +cd $RPM_BUILD_ROOT%{_libdir}/erlang/lib +for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib/$i || true ; done +popd +cp -av AUTHORS EPLICENCE README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} + +# Win32-specific functionality 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/os_mon-*/ebin/nteventlog.beam rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/webtool-*/priv/bin/start_webtool.bat +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/erlsrv.* +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/werl.* +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/nteventlog.* +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/win32reg.* + +# VxWorks specific +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/erl_set_memory_block.* # Remove old txt files rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/etc/otpCA/index.txt.old @@ -706,6 +720,7 @@ for d in $RPM_BUILD_ROOT%{_libdir}/erlang/lib/* ; do find $d/src -type f ! -name 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 find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/*/src -type d -empty -delete +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/cosFileTransfer-*/src # remove C and Java sources rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/c_src @@ -716,14 +731,12 @@ 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 directories -rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/doc +# remove empty directory 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/hipe-*/vsn.mk +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/*-*/info +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/hipe-*/vsn.mk # No longer needed utilities for formatting man-pages rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/misc @@ -740,6 +753,8 @@ install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-req install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-requires.sh install -D -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.erlang +# remove outdated script +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/Install %clean rm -rf $RPM_BUILD_ROOT @@ -747,15 +762,18 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) - -%doc AUTHORS EPLICENCE README.md -%doc %{_libdir}/erlang/PR.template -%doc %{_libdir}/erlang/README -%doc %{_libdir}/erlang/COPYRIGHT +%dir %{_docdir}/%{name}-%{ver}-%{rel}/ +%doc %{_docdir}/%{name}-%{ver}-%{rel}/AUTHORS +%doc %{_docdir}/%{name}-%{ver}-%{rel}/COPYRIGHT +%doc %{_docdir}/%{name}-%{ver}-%{rel}/EPLICENCE +%doc %{_docdir}/%{name}-%{ver}-%{rel}/PR.template +%doc %{_docdir}/%{name}-%{ver}-%{rel}/README +%doc %{_docdir}/%{name}-%{ver}-%{rel}/README.md %files appmon %defattr(-,root,root) %{_libdir}/erlang/lib/appmon-*/ +%{_libdir}/erlang/man/man3/appmon.* %files asn1 %defattr(-,root,root) @@ -763,66 +781,167 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/asn1-*/ebin %{_libdir}/erlang/lib/asn1-*/priv %{_libdir}/erlang/lib/asn1-*/src +%{_libdir}/erlang/man/man3/asn1ct.* +%{_libdir}/erlang/man/man3/asn1rt.* %files common_test %defattr(-,root,root) %{_libdir}/erlang/lib/common_test-*/ +%{_libdir}/erlang/man/man1/run_test.* +%{_libdir}/erlang/man/man3/ct.* +%{_libdir}/erlang/man/man3/ct_cover.* +%{_libdir}/erlang/man/man3/ct_ftp.* +%{_libdir}/erlang/man/man3/ct_master.* +%{_libdir}/erlang/man/man3/ct_rpc.* +%{_libdir}/erlang/man/man3/ct_snmp.* +%{_libdir}/erlang/man/man3/ct_ssh.* +%{_libdir}/erlang/man/man3/ct_telnet.* +%{_libdir}/erlang/man/man3/unix_telnet.* +%{_libdir}/erlang/man/man6/common_test.* %files compiler %defattr(-,root,root) %{_libdir}/erlang/lib/compiler-*/ +%{_libdir}/erlang/man/man3/compile.* %files cosEvent %defattr(-,root,root) %{_libdir}/erlang/lib/cosEvent-*/ +%{_libdir}/erlang/man/man3/cosEventApp.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ConsumerAdmin.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_EventChannel.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPullConsumer.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPullSupplier.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPushConsumer.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPushSupplier.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_SupplierAdmin.* %files cosEventDomain %defattr(-,root,root) %{_libdir}/erlang/lib/cosEventDomain-*/ +%{_libdir}/erlang/man/man3/CosEventDomainAdmin.* +%{_libdir}/erlang/man/man3/CosEventDomainAdmin_EventDomain.* +%{_libdir}/erlang/man/man3/CosEventDomainAdmin_EventDomainFactory.* +%{_libdir}/erlang/man/man3/cosEventDomainApp.* %files cosFileTransfer %defattr(-,root,root) %{_libdir}/erlang/lib/cosFileTransfer-*/ +%{_libdir}/erlang/man/man3/cosFileTransferApp.* +%{_libdir}/erlang/man/man3/CosFileTransfer_Directory.* +%{_libdir}/erlang/man/man3/CosFileTransfer_File.* +%{_libdir}/erlang/man/man3/CosFileTransfer_FileIterator.* +%{_libdir}/erlang/man/man3/CosFileTransfer_FileTransferSession.* +%{_libdir}/erlang/man/man3/CosFileTransfer_VirtualFileSystem.* %files cosNotification %defattr(-,root,root) %{_libdir}/erlang/lib/cosNotification-*/ +%{_libdir}/erlang/man/man3/CosNotification.* +%{_libdir}/erlang/man/man3/CosNotification_AdminPropertiesAdmin.* +%{_libdir}/erlang/man/man3/cosNotificationApp.* +%{_libdir}/erlang/man/man3/CosNotification_QoSAdmin.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ConsumerAdmin.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_EventChannel.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_EventChannelFactory.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPullConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPullSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPushConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPushSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxySupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPullConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPullSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPushConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPushSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPullConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPullSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPushConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPushSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SupplierAdmin.* +%{_libdir}/erlang/man/man3/CosNotifyComm_NotifyPublish.* +%{_libdir}/erlang/man/man3/CosNotifyComm_NotifySubscribe.* +%{_libdir}/erlang/man/man3/CosNotifyFilter_Filter.* +%{_libdir}/erlang/man/man3/CosNotifyFilter_FilterAdmin.* +%{_libdir}/erlang/man/man3/CosNotifyFilter_FilterFactory.* +%{_libdir}/erlang/man/man3/CosNotifyFilter_MappingFilter.* %files cosProperty %defattr(-,root,root) %{_libdir}/erlang/lib/cosProperty-*/ +%{_libdir}/erlang/man/man3/cosProperty.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertiesIterator.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertyNamesIterator.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertySet.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetDef.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetDefFactory.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetFactory.* %files cosTime %defattr(-,root,root) %{_libdir}/erlang/lib/cosTime-*/ - -%files cosTransaction +%{_libdir}/erlang/man/man3/cosTime.* +%{_libdir}/erlang/man/man3/CosTimerEvent_TimerEventHandler.* +%{_libdir}/erlang/man/man3/CosTimerEvent_TimerEventService.* +%{_libdir}/erlang/man/man3/CosTime_TimeService.* +%{_libdir}/erlang/man/man3/CosTime_TIO.* +%{_libdir}/erlang/man/man3/CosTime_UTO.* + +%files cosTransactions %defattr(-,root,root) %{_libdir}/erlang/lib/cosTransactions-*/ +%{_libdir}/erlang/man/man3/cosTransactions.* +%{_libdir}/erlang/man/man3/CosTransactions_Control.* +%{_libdir}/erlang/man/man3/CosTransactions_Coordinator.* +%{_libdir}/erlang/man/man3/CosTransactions_RecoveryCoordinator.* +%{_libdir}/erlang/man/man3/CosTransactions_Resource.* +%{_libdir}/erlang/man/man3/CosTransactions_SubtransactionAwareResource.* +%{_libdir}/erlang/man/man3/CosTransactions_Terminator.* +%{_libdir}/erlang/man/man3/CosTransactions_TransactionFactory.* %files crypto %defattr(-,root,root) %{_libdir}/erlang/lib/crypto-*/ +%{_libdir}/erlang/man/man3/crypto.* +%{_libdir}/erlang/man/man6/crypto.* %files debugger %defattr(-,root,root) %{_libdir}/erlang/lib/debugger-*/ +%{_libdir}/erlang/man/man3/debugger.* +%{_libdir}/erlang/man/man3/i.* +%{_libdir}/erlang/man/man3/int.* %files dialyzer %defattr(-,root,root) %{_libdir}/erlang/lib/dialyzer-*/ +%{_libdir}/erlang/man/man3/dialyzer.* %files doc %defattr(-,root,root) -%doc erlang_doc/* +%doc %{_docdir}/%{name}-%{ver}-%{rel}/doc +%doc %{_docdir}/%{name}-%{ver}-%{rel}/erts-*/ +%doc %{_docdir}/%{name}-%{ver}-%{rel}/lib/ + %files docbuilder %defattr(-,root,root) %{_libdir}/erlang/lib/docbuilder-*/ +%{_libdir}/erlang/man/man3/docb_gen.* +%{_libdir}/erlang/man/man3/docb_transform.* +%{_libdir}/erlang/man/man3/docb_xml_check.* +%{_libdir}/erlang/man/man6/docbuilder.* %files edoc %defattr(-,root,root) %{_libdir}/erlang/lib/edoc-*/ +%{_libdir}/erlang/man/man3/edoc.* +%{_libdir}/erlang/man/man3/edoc_doclet.* +%{_libdir}/erlang/man/man3/edoc_extract.* +%{_libdir}/erlang/man/man3/edoc_layout.* +%{_libdir}/erlang/man/man3/edoc_lib.* +%{_libdir}/erlang/man/man3/edoc_run.* %files erl_docgen %defattr(-,root,root) @@ -831,19 +950,53 @@ rm -rf $RPM_BUILD_ROOT %files erl_interface %defattr(-,root,root) %{_libdir}/erlang/lib/erl_interface-*/ +%{_libdir}/erlang/man/man1/erl_call.* +%{_libdir}/erlang/man/man3/ei.* +%{_libdir}/erlang/man/man3/ei_connect.* +%{_libdir}/erlang/man/man3/erl_connect.* +%{_libdir}/erlang/man/man3/erl_error.* +%{_libdir}/erlang/man/man3/erl_eterm.* +%{_libdir}/erlang/man/man3/erl_format.* +%{_libdir}/erlang/man/man3/erl_global.* +%{_libdir}/erlang/man/man3/erl_malloc.* +%{_libdir}/erlang/man/man3/erl_marshal.* +%{_libdir}/erlang/man/man3/registry.* %files erts %defattr(-,root,root) -%dir %{_libdir}/erlang + +# TODO these directories should be packaged separately +%dir %{_libdir}/erlang/ +%dir %{_libdir}/erlang/bin/ %dir %{_libdir}/erlang/lib/ +%dir %{_libdir}/erlang/man/ +%dir %{_libdir}/erlang/man/man1/ +%dir %{_libdir}/erlang/man/man3/ +%dir %{_libdir}/erlang/man/man4/ +%dir %{_libdir}/erlang/man/man6/ +%dir %{_libdir}/erlang/man/man7/ +%dir %{_libdir}/erlang/releases/ + %{_bindir}/* %{_libdir}/erlang/bin/ %{_libdir}/erlang/erts-*/ %{_libdir}/erlang/lib/erts-*/ -%{_libdir}/erlang/man/ -%{_libdir}/erlang/releases/ +%{_libdir}/erlang/man/man1/epmd.* +%{_libdir}/erlang/man/man1/erl.* +%{_libdir}/erlang/man/man1/erlc.* +%{_libdir}/erlang/man/man1/escript.* +%{_libdir}/erlang/man/man1/run_erl.* +%{_libdir}/erlang/man/man1/start.* +%{_libdir}/erlang/man/man1/start_erl.* +%{_libdir}/erlang/man/man3/driver_entry.* +%{_libdir}/erlang/man/man3/erl_driver.* +%{_libdir}/erlang/man/man3/erl_prim_loader.* +%{_libdir}/erlang/man/man3/erlang.* +%{_libdir}/erlang/man/man3/erts_alloc.* +%{_libdir}/erlang/man/man3/init.* +%{_libdir}/erlang/man/man3/zlib.* +%{_libdir}/erlang/releases/* %{_libdir}/erlang/usr/ -%{_libdir}/erlang/Install %files et %defattr(-,root,root) @@ -851,12 +1004,18 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/et-*/ebin %{_libdir}/erlang/lib/et-*/include %{_libdir}/erlang/lib/et-*/src +%{_libdir}/erlang/man/man3/et.* +%{_libdir}/erlang/man/man3/et_collector.* +%{_libdir}/erlang/man/man3/et_selector.* +%{_libdir}/erlang/man/man3/et_viewer.* %files eunit %defattr(-,root,root) %dir %{_libdir}/erlang/lib/eunit-*/ %{_libdir}/erlang/lib/eunit-*/ebin %{_libdir}/erlang/lib/eunit-*/include +%{_libdir}/erlang/man/man3/eunit.* +%{_libdir}/erlang/man/man3/eunit_surefire.* %files examples %defattr(-,root,root) @@ -885,6 +1044,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/gs-*/ebin %{_libdir}/erlang/lib/gs-*/priv %{_libdir}/erlang/lib/gs-*/src +%{_libdir}/erlang/man/man3/gs.* %files hipe %defattr(-,root,root) @@ -897,6 +1057,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/ic-*/include %{_libdir}/erlang/lib/ic-*/priv %{_libdir}/erlang/lib/ic-*/src +%{_libdir}/erlang/man/man3/ic.* +%{_libdir}/erlang/man/man3/ic_clib.* +%{_libdir}/erlang/man/man3/ic_c_protocol.* %files inets %defattr(-,root,root) @@ -904,10 +1067,28 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/inets-*/ebin %{_libdir}/erlang/lib/inets-*/priv %{_libdir}/erlang/lib/inets-*/src +%{_libdir}/erlang/man/man3/ftp.* +%{_libdir}/erlang/man/man3/httpc.* +%{_libdir}/erlang/man/man3/httpd.* +%{_libdir}/erlang/man/man3/httpd_conf.* +%{_libdir}/erlang/man/man3/httpd_socket.* +%{_libdir}/erlang/man/man3/httpd_util.* +%{_libdir}/erlang/man/man3/inets.* +%{_libdir}/erlang/man/man3/mod_alias.* +%{_libdir}/erlang/man/man3/mod_auth.* +%{_libdir}/erlang/man/man3/mod_esi.* +%{_libdir}/erlang/man/man3/mod_security.* +%{_libdir}/erlang/man/man3/tftp.* %files inviso %defattr(-,root,root) %{_libdir}/erlang/lib/inviso-*/ +%{_libdir}/erlang/man/man3/inviso.* +%{_libdir}/erlang/man/man3/inviso_as_lib.* +%{_libdir}/erlang/man/man3/inviso_lfm.* +%{_libdir}/erlang/man/man3/inviso_lfm_tpfreader.* +%{_libdir}/erlang/man/man3/inviso_rt.* +%{_libdir}/erlang/man/man3/inviso_rt_meta.* %files jinterface %defattr(-,root,root) @@ -919,6 +1100,39 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/kernel-*/ebin %{_libdir}/erlang/lib/kernel-*/include %{_libdir}/erlang/lib/kernel-*/src +%{_libdir}/erlang/man/man3/application.* +%{_libdir}/erlang/man/man3/auth.* +%{_libdir}/erlang/man/man3/code.* +%{_libdir}/erlang/man/man3/disk_log.* +%{_libdir}/erlang/man/man3/erl_boot_server.* +%{_libdir}/erlang/man/man3/erl_ddll.* +%{_libdir}/erlang/man/man3/erl_prim_loader_stub.* +%{_libdir}/erlang/man/man3/erlang_stub.* +%{_libdir}/erlang/man/man3/error_handler.* +%{_libdir}/erlang/man/man3/error_logger.* +%{_libdir}/erlang/man/man3/file.* +%{_libdir}/erlang/man/man3/gen_sctp.* +%{_libdir}/erlang/man/man3/gen_tcp.* +%{_libdir}/erlang/man/man3/gen_udp.* +%{_libdir}/erlang/man/man3/global.* +%{_libdir}/erlang/man/man3/global_group.* +%{_libdir}/erlang/man/man3/heart.* +%{_libdir}/erlang/man/man3/inet.* +%{_libdir}/erlang/man/man3/inet_res.* +%{_libdir}/erlang/man/man3/init_stub.* +%{_libdir}/erlang/man/man3/net_adm.* +%{_libdir}/erlang/man/man3/net_kernel.* +%{_libdir}/erlang/man/man3/os.* +%{_libdir}/erlang/man/man3/packages.* +%{_libdir}/erlang/man/man3/pg2.* +%{_libdir}/erlang/man/man3/rpc.* +%{_libdir}/erlang/man/man3/seq_trace.* +%{_libdir}/erlang/man/man3/user.* +%{_libdir}/erlang/man/man3/wrap_log_reader.* +%{_libdir}/erlang/man/man3/zlib_stub.* +%{_libdir}/erlang/man/man4/app.* +%{_libdir}/erlang/man/man4/config.* +%{_libdir}/erlang/man/man6/kernel.* %files megaco %defattr(-,root,root) @@ -927,6 +1141,18 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/megaco-*/include %{_libdir}/erlang/lib/megaco-*/priv %{_libdir}/erlang/lib/megaco-*/src +%{_libdir}/erlang/man/man3/megaco.* +%{_libdir}/erlang/man/man3/megaco_codec_meas.* +%{_libdir}/erlang/man/man3/megaco_codec_mstone1.* +%{_libdir}/erlang/man/man3/megaco_codec_mstone2.* +%{_libdir}/erlang/man/man3/megaco_codec_transform.* +%{_libdir}/erlang/man/man3/megaco_edist_compress.* +%{_libdir}/erlang/man/man3/megaco_encoder.* +%{_libdir}/erlang/man/man3/megaco_flex_scanner.* +%{_libdir}/erlang/man/man3/megaco_tcp.* +%{_libdir}/erlang/man/man3/megaco_transport.* +%{_libdir}/erlang/man/man3/megaco_udp.* +%{_libdir}/erlang/man/man3/megaco_user.* %files mnesia %defattr(-,root,root) @@ -934,14 +1160,21 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/mnesia-*/ebin %{_libdir}/erlang/lib/mnesia-*/include %{_libdir}/erlang/lib/mnesia-*/src +%{_libdir}/erlang/man/man3/mnesia.* +%{_libdir}/erlang/man/man3/mnesia_frag_hash.* +%{_libdir}/erlang/man/man3/mnesia_registry.* %files observer %defattr(-,root,root) %{_libdir}/erlang/lib/observer-*/ +%{_libdir}/erlang/man/man3/crashdump.* +%{_libdir}/erlang/man/man3/ttb.* +%{_libdir}/erlang/man/man6/observer.* %files odbc %defattr(-,root,root) %{_libdir}/erlang/lib/odbc-*/ +%{_libdir}/erlang/man/man3/odbc.* %files orber %defattr(-,root,root) @@ -952,36 +1185,69 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/orber-*/java_src %{_libdir}/erlang/lib/orber-*/priv %{_libdir}/erlang/lib/orber-*/src +%{_libdir}/erlang/man/man3/CosNaming.* +%{_libdir}/erlang/man/man3/CosNaming_BindingIterator.* +%{_libdir}/erlang/man/man3/CosNaming_NamingContext.* +%{_libdir}/erlang/man/man3/CosNaming_NamingContextExt.* +%{_libdir}/erlang/man/man3/Module_Interface.* +%{_libdir}/erlang/man/man3/any.* +%{_libdir}/erlang/man/man3/corba.* +%{_libdir}/erlang/man/man3/corba_object.* +%{_libdir}/erlang/man/man3/etop.* +%{_libdir}/erlang/man/man3/fixed.* +%{_libdir}/erlang/man/man3/interceptors.* +%{_libdir}/erlang/man/man3/lname.* +%{_libdir}/erlang/man/man3/lname_component.* +%{_libdir}/erlang/man/man3/orber.* +%{_libdir}/erlang/man/man3/orber_acl.* +%{_libdir}/erlang/man/man3/orber_diagnostics.* +%{_libdir}/erlang/man/man3/orber_ifr.* +%{_libdir}/erlang/man/man3/orber_tc.* %files os_mon %defattr(-,root,root) %{_libdir}/erlang/lib/os_mon-*/ +%{_libdir}/erlang/man/man3/cpu_sup.* +%{_libdir}/erlang/man/man3/disksup.* +%{_libdir}/erlang/man/man3/memsup.* +%{_libdir}/erlang/man/man3/os_mon_mib.* +%{_libdir}/erlang/man/man3/os_sup.* +%{_libdir}/erlang/man/man6/os_mon.* %files otp_mibs %defattr(-,root,root) %{_libdir}/erlang/lib/otp_mibs-*/ +%{_libdir}/erlang/man/man3/otp_mib.* %files parsetools %defattr(-,root,root) %{_libdir}/erlang/lib/parsetools-*/ +%{_libdir}/erlang/man/man3/leex.* +%{_libdir}/erlang/man/man3/yecc.* %files percept %defattr(-,root,root) %{_libdir}/erlang/lib/percept-*/ +%{_libdir}/erlang/man/man3/egd.* +%{_libdir}/erlang/man/man3/percept.* +%{_libdir}/erlang/man/man3/percept_profile.* %files pman %defattr(-,root,root) %{_libdir}/erlang/lib/pman-*/ +%{_libdir}/erlang/man/man3/pman.* %files public_key %defattr(-,root,root) %{_libdir}/erlang/lib/public_key-*/ +%{_libdir}/erlang/man/man3/public_key.* %files reltool %defattr(-,root,root) %dir %{_libdir}/erlang/lib/reltool-*/ %{_libdir}/erlang/lib/reltool-*/ebin %{_libdir}/erlang/lib/reltool-*/src +%{_libdir}/erlang/man/man3/reltool.* %files rpm-macros %defattr(-,root,root) @@ -994,10 +1260,23 @@ rm -rf $RPM_BUILD_ROOT %files runtime_tools %defattr(-,root,root) %{_libdir}/erlang/lib/runtime_tools-*/ +%{_libdir}/erlang/man/man3/dbg.* +%{_libdir}/erlang/man/man3/erts_alloc_config.* +%{_libdir}/erlang/man/man6/runtime_tools.* %files sasl %defattr(-,root,root) %{_libdir}/erlang/lib/sasl-*/ +%{_libdir}/erlang/man/man3/alarm_handler.* +%{_libdir}/erlang/man/man3/overload.* +%{_libdir}/erlang/man/man3/rb.* +%{_libdir}/erlang/man/man3/release_handler.* +%{_libdir}/erlang/man/man3/systools.* +%{_libdir}/erlang/man/man4/appup.* +%{_libdir}/erlang/man/man4/rel.* +%{_libdir}/erlang/man/man4/relup.* +%{_libdir}/erlang/man/man4/script.* +%{_libdir}/erlang/man/man6/sasl.* %files snmp %defattr(-,root,root) @@ -1007,10 +1286,62 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/snmp-*/mibs %{_libdir}/erlang/lib/snmp-*/priv %{_libdir}/erlang/lib/snmp-*/src +%{_libdir}/erlang/man/man3/snmp.* +%{_libdir}/erlang/man/man3/snmpa.* +%{_libdir}/erlang/man/man3/snmpa_conf.* +%{_libdir}/erlang/man/man3/snmpa_discovery_handler.* +%{_libdir}/erlang/man/man3/snmpa_error.* +%{_libdir}/erlang/man/man3/snmpa_error_io.* +%{_libdir}/erlang/man/man3/snmpa_error_logger.* +%{_libdir}/erlang/man/man3/snmpa_error_report.* +%{_libdir}/erlang/man/man3/snmpa_local_db.* +%{_libdir}/erlang/man/man3/snmpa_mpd.* +%{_libdir}/erlang/man/man3/snmpa_network_interface.* +%{_libdir}/erlang/man/man3/snmpa_network_interface_filter.* +%{_libdir}/erlang/man/man3/snmpa_notification_delivery_info_receiver.* +%{_libdir}/erlang/man/man3/snmpa_notification_filter.* +%{_libdir}/erlang/man/man3/snmpa_supervisor.* +%{_libdir}/erlang/man/man3/snmpc.* +%{_libdir}/erlang/man/man3/snmp_community_mib.* +%{_libdir}/erlang/man/man3/snmp_framework_mib.* +%{_libdir}/erlang/man/man3/snmp_generic.* +%{_libdir}/erlang/man/man3/snmp_index.* +%{_libdir}/erlang/man/man3/snmpm.* +%{_libdir}/erlang/man/man3/snmpm_conf.* +%{_libdir}/erlang/man/man3/snmpm_mpd.* +%{_libdir}/erlang/man/man3/snmpm_network_interface.* +%{_libdir}/erlang/man/man3/snmpm_network_interface_filter.* +%{_libdir}/erlang/man/man3/snmpm_user.* +%{_libdir}/erlang/man/man3/snmp_notification_mib.* +%{_libdir}/erlang/man/man3/snmp_pdus.* +%{_libdir}/erlang/man/man3/snmp_standard_mib.* +%{_libdir}/erlang/man/man3/snmp_target_mib.* +%{_libdir}/erlang/man/man3/snmp_user_based_sm_mib.* +%{_libdir}/erlang/man/man3/snmp_view_based_acm_mib.* +%{_libdir}/erlang/man/man6/snmp.* +%{_libdir}/erlang/man/man7/INET-ADDRESS-MIB.* +%{_libdir}/erlang/man/man7/OTP-SNMPEA-MIB.* +%{_libdir}/erlang/man/man7/RFC1213-MIB.* +%{_libdir}/erlang/man/man7/SNMP-COMMUNITY-MIB.* +%{_libdir}/erlang/man/man7/SNMP-FRAMEWORK-MIB.* +%{_libdir}/erlang/man/man7/SNMP-MPD-MIB.* +%{_libdir}/erlang/man/man7/SNMP-NOTIFICATION-MIB.* +%{_libdir}/erlang/man/man7/SNMP-TARGET-MIB.* +%{_libdir}/erlang/man/man7/SNMP-USER-BASED-SM-MIB.* +%{_libdir}/erlang/man/man7/SNMP-USM-AES-MIB.* +%{_libdir}/erlang/man/man7/SNMPv2-MIB.* +%{_libdir}/erlang/man/man7/SNMPv2-TM.* +%{_libdir}/erlang/man/man7/SNMP-VIEW-BASED-ACM-MIB.* +%{_libdir}/erlang/man/man7/STANDARD-MIB.* %files ssh %defattr(-,root,root) %{_libdir}/erlang/lib/ssh-*/ +%{_libdir}/erlang/man/man3/ssh.* +%{_libdir}/erlang/man/man3/ssh_channel.* +%{_libdir}/erlang/man/man3/ssh_connection.* +%{_libdir}/erlang/man/man3/ssh_sftp.* +%{_libdir}/erlang/man/man3/ssh_sftpd.* %files ssl %defattr(-,root,root) @@ -1020,6 +1351,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/ssl-*/pkix %{_libdir}/erlang/lib/ssl-*/priv %{_libdir}/erlang/lib/ssl-*/src +%{_libdir}/erlang/man/man3/new_ssl.* +%{_libdir}/erlang/man/man3/ssl.* +%{_libdir}/erlang/man/man6/ssl.* %files stdlib %defattr(-,root,root) @@ -1027,19 +1361,91 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/stdlib-*/ebin %{_libdir}/erlang/lib/stdlib-*/include %{_libdir}/erlang/lib/stdlib-*/src +%{_libdir}/erlang/man/man3/array.* +%{_libdir}/erlang/man/man3/base64.* +%{_libdir}/erlang/man/man3/beam_lib.* +%{_libdir}/erlang/man/man3/c.* +%{_libdir}/erlang/man/man3/calendar.* +%{_libdir}/erlang/man/man3/dets.* +%{_libdir}/erlang/man/man3/dict.* +%{_libdir}/erlang/man/man3/digraph.* +%{_libdir}/erlang/man/man3/digraph_utils.* +%{_libdir}/erlang/man/man3/epp.* +%{_libdir}/erlang/man/man3/erl_eval.* +%{_libdir}/erlang/man/man3/erl_expand_records.* +%{_libdir}/erlang/man/man3/erl_id_trans.* +%{_libdir}/erlang/man/man3/erl_internal.* +%{_libdir}/erlang/man/man3/erl_lint.* +%{_libdir}/erlang/man/man3/erl_parse.* +%{_libdir}/erlang/man/man3/erl_pp.* +%{_libdir}/erlang/man/man3/erl_scan.* +%{_libdir}/erlang/man/man3/erl_tar.* +%{_libdir}/erlang/man/man3/ets.* +%{_libdir}/erlang/man/man3/file_sorter.* +%{_libdir}/erlang/man/man3/filelib.* +%{_libdir}/erlang/man/man3/filename.* +%{_libdir}/erlang/man/man3/gb_sets.* +%{_libdir}/erlang/man/man3/gb_trees.* +%{_libdir}/erlang/man/man3/gen_event.* +%{_libdir}/erlang/man/man3/gen_fsm.* +%{_libdir}/erlang/man/man3/gen_server.* +%{_libdir}/erlang/man/man3/io.* +%{_libdir}/erlang/man/man3/io_lib.* +%{_libdir}/erlang/man/man3/lib.* +%{_libdir}/erlang/man/man3/lists.* +%{_libdir}/erlang/man/man3/log_mf_h.* +%{_libdir}/erlang/man/man3/math.* +%{_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/random.* +%{_libdir}/erlang/man/man3/re.* +%{_libdir}/erlang/man/man3/regexp.* +%{_libdir}/erlang/man/man3/sets.* +%{_libdir}/erlang/man/man3/shell.* +%{_libdir}/erlang/man/man3/shell_default.* +%{_libdir}/erlang/man/man3/slave.* +%{_libdir}/erlang/man/man3/sofs.* +%{_libdir}/erlang/man/man3/string.* +%{_libdir}/erlang/man/man3/supervisor.* +%{_libdir}/erlang/man/man3/supervisor_bridge.* +%{_libdir}/erlang/man/man3/sys.* +%{_libdir}/erlang/man/man3/timer.* +%{_libdir}/erlang/man/man3/unicode.* +%{_libdir}/erlang/man/man3/zip.* +%{_libdir}/erlang/man/man6/stdlib.* %files syntax_tools %defattr(-,root,root) %dir %{_libdir}/erlang/lib/syntax_tools-*/ %{_libdir}/erlang/lib/syntax_tools-*/ebin +%{_libdir}/erlang/man/man3/epp_dodger.* +%{_libdir}/erlang/man/man3/erl_comment_scan.* +%{_libdir}/erlang/man/man3/erl_prettypr.* +%{_libdir}/erlang/man/man3/erl_recomment.* +%{_libdir}/erlang/man/man3/erl_syntax.* +%{_libdir}/erlang/man/man3/erl_syntax_lib.* +%{_libdir}/erlang/man/man3/erl_tidy.* +%{_libdir}/erlang/man/man3/igor.* +%{_libdir}/erlang/man/man3/prettypr.* %files test_server %defattr(-,root,root) %{_libdir}/erlang/lib/test_server-*/ +%{_libdir}/erlang/man/man3/test_server.* +%{_libdir}/erlang/man/man3/test_server_ctrl.* +%{_libdir}/erlang/man/man6/test_server.* %files toolbar %defattr(-,root,root) %{_libdir}/erlang/lib/toolbar-*/ +%{_libdir}/erlang/man/man3/toolbar.* %files tools %defattr(-,root,root) @@ -1049,10 +1455,21 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/tools-*/emacs %{_libdir}/erlang/lib/tools-*/priv %{_libdir}/erlang/lib/tools-*/src +%{_libdir}/erlang/man/man3/cover.* +%{_libdir}/erlang/man/man3/cprof.* +%{_libdir}/erlang/man/man3/eprof.* +%{_libdir}/erlang/man/man3/erlang_mode.* +%{_libdir}/erlang/man/man3/fprof.* +%{_libdir}/erlang/man/man3/instrument.* +%{_libdir}/erlang/man/man3/lcnt.* +%{_libdir}/erlang/man/man3/make.* +%{_libdir}/erlang/man/man3/tags.* +%{_libdir}/erlang/man/man3/xref.* %files tv %defattr(-,root,root) %{_libdir}/erlang/lib/tv-*/ +%{_libdir}/erlang/man/man3/tv.* %files typer %defattr(-,root,root) @@ -1061,6 +1478,8 @@ rm -rf $RPM_BUILD_ROOT %files webtool %defattr(-,root,root) %{_libdir}/erlang/lib/webtool-*/ +%{_libdir}/erlang/man/man1/start_webtool.* +%{_libdir}/erlang/man/man3/webtool.* %files wx %defattr(-,root,root) @@ -1069,17 +1488,249 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/wx-*/include %{_libdir}/erlang/lib/wx-*/priv %{_libdir}/erlang/lib/wx-*/src +%{_libdir}/erlang/man/man3/gl.* +%{_libdir}/erlang/man/man3/glu.* +%{_libdir}/erlang/man/man3/wx.* +%{_libdir}/erlang/man/man3/wx_misc.* +%{_libdir}/erlang/man/man3/wx_object.* +%{_libdir}/erlang/man/man3/wxAcceleratorEntry.* +%{_libdir}/erlang/man/man3/wxAcceleratorTable.* +%{_libdir}/erlang/man/man3/wxArtProvider.* +%{_libdir}/erlang/man/man3/wxAuiDockArt.* +%{_libdir}/erlang/man/man3/wxAuiManager.* +%{_libdir}/erlang/man/man3/wxAuiManagerEvent.* +%{_libdir}/erlang/man/man3/wxAuiNotebook.* +%{_libdir}/erlang/man/man3/wxAuiNotebookEvent.* +%{_libdir}/erlang/man/man3/wxAuiPaneInfo.* +%{_libdir}/erlang/man/man3/wxAuiTabArt.* +%{_libdir}/erlang/man/man3/wxBitmap.* +%{_libdir}/erlang/man/man3/wxBitmapButton.* +%{_libdir}/erlang/man/man3/wxBitmapDataObject.* +%{_libdir}/erlang/man/man3/wxBoxSizer.* +%{_libdir}/erlang/man/man3/wxBrush.* +%{_libdir}/erlang/man/man3/wxBufferedDC.* +%{_libdir}/erlang/man/man3/wxBufferedPaintDC.* +%{_libdir}/erlang/man/man3/wxButton.* +%{_libdir}/erlang/man/man3/wxCalendarCtrl.* +%{_libdir}/erlang/man/man3/wxCalendarDateAttr.* +%{_libdir}/erlang/man/man3/wxCalendarEvent.* +%{_libdir}/erlang/man/man3/wxCaret.* +%{_libdir}/erlang/man/man3/wxCheckBox.* +%{_libdir}/erlang/man/man3/wxCheckListBox.* +%{_libdir}/erlang/man/man3/wxChildFocusEvent.* +%{_libdir}/erlang/man/man3/wxChoice.* +%{_libdir}/erlang/man/man3/wxChoicebook.* +%{_libdir}/erlang/man/man3/wxClientDC.* +%{_libdir}/erlang/man/man3/wxClipboard.* +%{_libdir}/erlang/man/man3/wxCloseEvent.* +%{_libdir}/erlang/man/man3/wxColourData.* +%{_libdir}/erlang/man/man3/wxColourDialog.* +%{_libdir}/erlang/man/man3/wxColourPickerCtrl.* +%{_libdir}/erlang/man/man3/wxColourPickerEvent.* +%{_libdir}/erlang/man/man3/wxComboBox.* +%{_libdir}/erlang/man/man3/wxCommandEvent.* +%{_libdir}/erlang/man/man3/wxContextMenuEvent.* +%{_libdir}/erlang/man/man3/wxControl.* +%{_libdir}/erlang/man/man3/wxControlWithItems.* +%{_libdir}/erlang/man/man3/wxCursor.* +%{_libdir}/erlang/man/man3/wxDataObject.* +%{_libdir}/erlang/man/man3/wxDateEvent.* +%{_libdir}/erlang/man/man3/wxDatePickerCtrl.* +%{_libdir}/erlang/man/man3/wxDC.* +%{_libdir}/erlang/man/man3/wxDialog.* +%{_libdir}/erlang/man/man3/wxDirDialog.* +%{_libdir}/erlang/man/man3/wxDirPickerCtrl.* +%{_libdir}/erlang/man/man3/wxDisplayChangedEvent.* +%{_libdir}/erlang/man/man3/wxEraseEvent.* +%{_libdir}/erlang/man/man3/wxEvent.* +%{_libdir}/erlang/man/man3/wxEvtHandler.* +%{_libdir}/erlang/man/man3/wxFileDataObject.* +%{_libdir}/erlang/man/man3/wxFileDialog.* +%{_libdir}/erlang/man/man3/wxFileDirPickerEvent.* +%{_libdir}/erlang/man/man3/wxFilePickerCtrl.* +%{_libdir}/erlang/man/man3/wxFindReplaceData.* +%{_libdir}/erlang/man/man3/wxFindReplaceDialog.* +%{_libdir}/erlang/man/man3/wxFlexGridSizer.* +%{_libdir}/erlang/man/man3/wxFocusEvent.* +%{_libdir}/erlang/man/man3/wxFont.* +%{_libdir}/erlang/man/man3/wxFontData.* +%{_libdir}/erlang/man/man3/wxFontDialog.* +%{_libdir}/erlang/man/man3/wxFontPickerCtrl.* +%{_libdir}/erlang/man/man3/wxFontPickerEvent.* +%{_libdir}/erlang/man/man3/wxFrame.* +%{_libdir}/erlang/man/man3/wxGauge.* +%{_libdir}/erlang/man/man3/wxGBSizerItem.* +%{_libdir}/erlang/man/man3/wxGenericDirCtrl.* +%{_libdir}/erlang/man/man3/wxGLCanvas.* +%{_libdir}/erlang/man/man3/wxGraphicsBrush.* +%{_libdir}/erlang/man/man3/wxGraphicsContext.* +%{_libdir}/erlang/man/man3/wxGraphicsFont.* +%{_libdir}/erlang/man/man3/wxGraphicsMatrix.* +%{_libdir}/erlang/man/man3/wxGraphicsObject.* +%{_libdir}/erlang/man/man3/wxGraphicsPath.* +%{_libdir}/erlang/man/man3/wxGraphicsPen.* +%{_libdir}/erlang/man/man3/wxGraphicsRenderer.* +%{_libdir}/erlang/man/man3/wxGrid.* +%{_libdir}/erlang/man/man3/wxGridBagSizer.* +%{_libdir}/erlang/man/man3/wxGridCellAttr.* +%{_libdir}/erlang/man/man3/wxGridCellBoolEditor.* +%{_libdir}/erlang/man/man3/wxGridCellBoolRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellChoiceEditor.* +%{_libdir}/erlang/man/man3/wxGridCellEditor.* +%{_libdir}/erlang/man/man3/wxGridCellFloatEditor.* +%{_libdir}/erlang/man/man3/wxGridCellFloatRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellNumberEditor.* +%{_libdir}/erlang/man/man3/wxGridCellNumberRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellStringRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellTextEditor.* +%{_libdir}/erlang/man/man3/wxGridEvent.* +%{_libdir}/erlang/man/man3/wxGridSizer.* +%{_libdir}/erlang/man/man3/wxHelpEvent.* +%{_libdir}/erlang/man/man3/wxHtmlEasyPrinting.* +%{_libdir}/erlang/man/man3/wxHtmlLinkEvent.* +%{_libdir}/erlang/man/man3/wxHtmlWindow.* +%{_libdir}/erlang/man/man3/wxIcon.* +%{_libdir}/erlang/man/man3/wxIconBundle.* +%{_libdir}/erlang/man/man3/wxIconizeEvent.* +%{_libdir}/erlang/man/man3/wxIdleEvent.* +%{_libdir}/erlang/man/man3/wxImage.* +%{_libdir}/erlang/man/man3/wxImageList.* +%{_libdir}/erlang/man/man3/wxJoystickEvent.* +%{_libdir}/erlang/man/man3/wxKeyEvent.* +%{_libdir}/erlang/man/man3/wxLayoutAlgorithm.* +%{_libdir}/erlang/man/man3/wxListbook.* +%{_libdir}/erlang/man/man3/wxListBox.* +%{_libdir}/erlang/man/man3/wxListCtrl.* +%{_libdir}/erlang/man/man3/wxListEvent.* +%{_libdir}/erlang/man/man3/wxListItem.* +%{_libdir}/erlang/man/man3/wxListView.* +%{_libdir}/erlang/man/man3/wxLogNull.* +%{_libdir}/erlang/man/man3/wxMask.* +%{_libdir}/erlang/man/man3/wxMaximizeEvent.* +%{_libdir}/erlang/man/man3/wxMDIChildFrame.* +%{_libdir}/erlang/man/man3/wxMDIClientWindow.* +%{_libdir}/erlang/man/man3/wxMDIParentFrame.* +%{_libdir}/erlang/man/man3/wxMemoryDC.* +%{_libdir}/erlang/man/man3/wxMenu.* +%{_libdir}/erlang/man/man3/wxMenuBar.* +%{_libdir}/erlang/man/man3/wxMenuEvent.* +%{_libdir}/erlang/man/man3/wxMenuItem.* +%{_libdir}/erlang/man/man3/wxMessageDialog.* +%{_libdir}/erlang/man/man3/wxMiniFrame.* +%{_libdir}/erlang/man/man3/wxMirrorDC.* +%{_libdir}/erlang/man/man3/wxMouseCaptureChangedEvent.* +%{_libdir}/erlang/man/man3/wxMouseEvent.* +%{_libdir}/erlang/man/man3/wxMoveEvent.* +%{_libdir}/erlang/man/man3/wxMultiChoiceDialog.* +%{_libdir}/erlang/man/man3/wxNavigationKeyEvent.* +%{_libdir}/erlang/man/man3/wxNcPaintEvent.* +%{_libdir}/erlang/man/man3/wxNotebook.* +%{_libdir}/erlang/man/man3/wxNotebookEvent.* +%{_libdir}/erlang/man/man3/wxNotifyEvent.* +%{_libdir}/erlang/man/man3/wxPageSetupDialog.* +%{_libdir}/erlang/man/man3/wxPageSetupDialogData.* +%{_libdir}/erlang/man/man3/wxPaintDC.* +%{_libdir}/erlang/man/man3/wxPaintEvent.* +%{_libdir}/erlang/man/man3/wxPalette.* +%{_libdir}/erlang/man/man3/wxPaletteChangedEvent.* +%{_libdir}/erlang/man/man3/wxPanel.* +%{_libdir}/erlang/man/man3/wxPasswordEntryDialog.* +%{_libdir}/erlang/man/man3/wxPen.* +%{_libdir}/erlang/man/man3/wxPickerBase.* +%{_libdir}/erlang/man/man3/wxPostScriptDC.* +%{_libdir}/erlang/man/man3/wxPreviewCanvas.* +%{_libdir}/erlang/man/man3/wxPreviewControlBar.* +%{_libdir}/erlang/man/man3/wxPreviewFrame.* +%{_libdir}/erlang/man/man3/wxPrintData.* +%{_libdir}/erlang/man/man3/wxPrintDialog.* +%{_libdir}/erlang/man/man3/wxPrintDialogData.* +%{_libdir}/erlang/man/man3/wxPrinter.* +%{_libdir}/erlang/man/man3/wxPrintout.* +%{_libdir}/erlang/man/man3/wxPrintPreview.* +%{_libdir}/erlang/man/man3/wxProgressDialog.* +%{_libdir}/erlang/man/man3/wxQueryNewPaletteEvent.* +%{_libdir}/erlang/man/man3/wxRadioBox.* +%{_libdir}/erlang/man/man3/wxRadioButton.* +%{_libdir}/erlang/man/man3/wxRegion.* +%{_libdir}/erlang/man/man3/wxSashEvent.* +%{_libdir}/erlang/man/man3/wxSashLayoutWindow.* +%{_libdir}/erlang/man/man3/wxSashWindow.* +%{_libdir}/erlang/man/man3/wxScreenDC.* +%{_libdir}/erlang/man/man3/wxScrollBar.* +%{_libdir}/erlang/man/man3/wxScrolledWindow.* +%{_libdir}/erlang/man/man3/wxScrollEvent.* +%{_libdir}/erlang/man/man3/wxScrollWinEvent.* +%{_libdir}/erlang/man/man3/wxSetCursorEvent.* +%{_libdir}/erlang/man/man3/wxShowEvent.* +%{_libdir}/erlang/man/man3/wxSingleChoiceDialog.* +%{_libdir}/erlang/man/man3/wxSizeEvent.* +%{_libdir}/erlang/man/man3/wxSizer.* +%{_libdir}/erlang/man/man3/wxSizerFlags.* +%{_libdir}/erlang/man/man3/wxSizerItem.* +%{_libdir}/erlang/man/man3/wxSlider.* +%{_libdir}/erlang/man/man3/wxSpinButton.* +%{_libdir}/erlang/man/man3/wxSpinCtrl.* +%{_libdir}/erlang/man/man3/wxSpinEvent.* +%{_libdir}/erlang/man/man3/wxSplashScreen.* +%{_libdir}/erlang/man/man3/wxSplitterEvent.* +%{_libdir}/erlang/man/man3/wxSplitterWindow.* +%{_libdir}/erlang/man/man3/wxStaticBitmap.* +%{_libdir}/erlang/man/man3/wxStaticBox.* +%{_libdir}/erlang/man/man3/wxStaticBoxSizer.* +%{_libdir}/erlang/man/man3/wxStaticLine.* +%{_libdir}/erlang/man/man3/wxStaticText.* +%{_libdir}/erlang/man/man3/wxStatusBar.* +%{_libdir}/erlang/man/man3/wxStdDialogButtonSizer.* +%{_libdir}/erlang/man/man3/wxStyledTextCtrl.* +%{_libdir}/erlang/man/man3/wxStyledTextEvent.* +%{_libdir}/erlang/man/man3/wxSysColourChangedEvent.* +%{_libdir}/erlang/man/man3/wxTextAttr.* +%{_libdir}/erlang/man/man3/wxTextCtrl.* +%{_libdir}/erlang/man/man3/wxTextDataObject.* +%{_libdir}/erlang/man/man3/wxTextEntryDialog.* +%{_libdir}/erlang/man/man3/wxToggleButton.* +%{_libdir}/erlang/man/man3/wxToolBar.* +%{_libdir}/erlang/man/man3/wxToolbook.* +%{_libdir}/erlang/man/man3/wxToolTip.* +%{_libdir}/erlang/man/man3/wxTopLevelWindow.* +%{_libdir}/erlang/man/man3/wxTreebook.* +%{_libdir}/erlang/man/man3/wxTreeCtrl.* +%{_libdir}/erlang/man/man3/wxTreeEvent.* +%{_libdir}/erlang/man/man3/wxUpdateUIEvent.* +%{_libdir}/erlang/man/man3/wxWindow.* +%{_libdir}/erlang/man/man3/wxWindowCreateEvent.* +%{_libdir}/erlang/man/man3/wxWindowDC.* +%{_libdir}/erlang/man/man3/wxWindowDestroyEvent.* +%{_libdir}/erlang/man/man3/wxXmlResource.* %files xmerl %defattr(-,root,root) %{_libdir}/erlang/lib/xmerl-*/ +%{_libdir}/erlang/man/man3/xmerl.* +%{_libdir}/erlang/man/man3/xmerl_eventp.* +%{_libdir}/erlang/man/man3/xmerl_sax_parser.* +%{_libdir}/erlang/man/man3/xmerl_scan.* +%{_libdir}/erlang/man/man3/xmerl_xpath.* +%{_libdir}/erlang/man/man3/xmerl_xs.* +%{_libdir}/erlang/man/man3/xmerl_xsd.* -%post -%{_libdir}/erlang/Install -minimal -cross %{_libdir}/erlang >/dev/null 2>/dev/null +%changelog +* Wed Apr 28 2010 Peter Lemenkov - R13B-04.9 +- Added missing files, necessary for emacs (see rhbz #585349) +- Patches rebased +* Tue Apr 27 2010 Peter Lemenkov - R13B-04.8 +- Added missing BuildRequires libxslt (for building docs) +- Removed %%post script completely (resolves rhbz #586428) +- Since now both docs and man-pages are built from sources +- No need to manually create symlinks in %%{_bindir} + +* Mon Apr 26 2010 Peter Lemenkov - R13B-04.7 +- Build with erlang-rpm-macros +- Man-files are packed with packages, they belong to -%changelog * Mon Apr 26 2010 Peter Lemenkov - R13B-04.6 - Made erlang-rpm-macros as separate package - Fix error while installing erlang-rpm-macros diff --git a/import.log b/import.log index 97016fb..69b579b 100644 --- a/import.log +++ b/import.log @@ -4,3 +4,4 @@ erlang-R13B-04_3_fc12:F-12:erlang-R13B-04.3.fc12.src.rpm:1271239367 erlang-R13B-04_4_fc12:F-12:erlang-R13B-04.4.fc12.src.rpm:1271523892 erlang-R13B-04_5_fc12:F-12:erlang-R13B-04.5.fc12.src.rpm:1272271343 erlang-R13B-04_6_fc12:F-12:erlang-R13B-04.6.fc12.src.rpm:1272303739 +erlang-R13B-04_9_fc12:F-12:erlang-R13B-04.9.fc12.src.rpm:1272528494 diff --git a/otp-0001-Do-not-format-man-pages.patch b/otp-0001-Do-not-format-man-pages.patch index 5f9594f..632408b 100644 --- a/otp-0001-Do-not-format-man-pages.patch +++ b/otp-0001-Do-not-format-man-pages.patch @@ -1,7 +1,7 @@ From 80fd602b5cd9f4aaa7b6bd95e174708e27601db5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 25 Feb 2010 16:45:28 +0300 -Subject: [PATCH 1/9] Do not format man-pages +Subject: [PATCH 1/7] Do not format man-pages Signed-off-by: Peter Lemenkov --- diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 0293073..1da9a67 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -1,7 +1,7 @@ From 2e10f728feb56ea96b2832999a8c34f1f19646bc Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 25 Feb 2010 16:57:43 +0300 -Subject: [PATCH 2/9] Remove rpath +Subject: [PATCH 2/7] Remove rpath Signed-off-by: Peter Lemenkov --- diff --git a/otp-0004-Fix-shared-libraries-installation.patch b/otp-0004-Fix-shared-libraries-installation.patch new file mode 100644 index 0000000..f828169 --- /dev/null +++ b/otp-0004-Fix-shared-libraries-installation.patch @@ -0,0 +1,58 @@ +From edaced375235a006c87a3e15b8b17e9bc6dbb923 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 15 Apr 2010 13:31:36 +0400 +Subject: [PATCH 4/7] Fix shared libraries installation + +Several shared libraries (asn1_erl_drv.so, megaco_flex_scanner_drv_mt.so, +megaco_flex_scanner_drv.so, wxe_driver.so) were installed as data files +previously. + +Signed-off-by: Peter Lemenkov +--- + lib/asn1/c_src/Makefile | 2 +- + lib/megaco/src/flex/Makefile.in | 2 +- + lib/wx/c_src/Makefile.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile +index 906c513..9e9cb18 100644 +--- a/lib/asn1/c_src/Makefile ++++ b/lib/asn1/c_src/Makefile +@@ -124,7 +124,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/lib +- $(INSTALL_DATA) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib + $(INSTALL_DIR) $(RELSYSDIR)/c_src + $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src + +diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in +index 6ce9b34..5af651d 100644 +--- a/lib/megaco/src/flex/Makefile.in ++++ b/lib/megaco/src/flex/Makefile.in +@@ -280,7 +280,7 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) + $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex +- $(INSTALL_DATA) $(SOLIBS) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib + endif + + +diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in +index 5a0b4ce..8710641 100644 +--- a/lib/wx/c_src/Makefile.in ++++ b/lib/wx/c_src/Makefile.in +@@ -167,7 +167,7 @@ release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/$(SYS_TYPE) + $(INSTALL_DATA) ../priv/erlang-logo32.png $(RELSYSDIR)/priv/ + $(INSTALL_DATA) ../priv/erlang-logo64.png $(RELSYSDIR)/priv/ +- $(INSTALL_DATA) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) ++ $(INSTALL_PROGRAM) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) + + release_docs_spec: + +-- +1.6.6.1 + diff --git a/otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch b/otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch new file mode 100644 index 0000000..4f55214 --- /dev/null +++ b/otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch @@ -0,0 +1,35 @@ +From 3475d4f155dc4bc2919e371e614fee81f01e87d5 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Fri, 16 Apr 2010 21:13:47 +0400 +Subject: [PATCH 5/7] Fix for dlopening libGL and libGLU + +Signed-off-by: Peter Lemenkov +--- + lib/wx/c_src/wxe_gl.cpp | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp +index 63dd68f..36bf15f 100644 +--- a/lib/wx/c_src/wxe_gl.cpp ++++ b/lib/wx/c_src/wxe_gl.cpp +@@ -81,7 +81,7 @@ int initOpenGL() + WCHAR * DLName = wxT("opengl32.dll"); + HMODULE LIBhandle = LoadLibrary(DLName); + #else +- char * DLName = (char *) "libGL.so"; ++ char * DLName = (char *) "libGL.so.1"; + void * LIBhandle = dlopen(DLName, RTLD_LAZY); + #endif + // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); +@@ -132,7 +132,7 @@ int initOpenGL() + DLName = wxT("glu32.dll"); + LIBhandle = LoadLibrary(DLName); + #else +- DLName = (char *) "libGLU.so"; ++ DLName = (char *) "libGLU.so.1"; + LIBhandle = dlopen(DLName, RTLD_LAZY); + #endif + // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); +-- +1.6.6.1 + diff --git a/otp-0006-Fix-check-for-compile-workspace-overflow.patch b/otp-0006-Fix-check-for-compile-workspace-overflow.patch new file mode 100644 index 0000000..37363de --- /dev/null +++ b/otp-0006-Fix-check-for-compile-workspace-overflow.patch @@ -0,0 +1,55 @@ +From 400034faee44b65a5e33014e7ce4edcfcfba870f Mon Sep 17 00:00:00 2001 +From: Michael Santos +Date: Thu, 18 Mar 2010 20:08:10 -0400 +Subject: [PATCH 6/7] Fix check for compile workspace overflow + +Patch from: +http://vcs.pcre.org/viewvc/code/trunk/pcre_compile.c?r1=504&r2=505&view=patch + +Test case: +N = 819, re:compile([lists:duplicate(N, $(), lists:duplicate(N, $))]). + +Compiling large regular expressions could overflow the workspace +buffer. Modify the test to check for a value smaller than the buffer +size. +--- + erts/emulator/pcre/pcre_compile.c | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c +index 2974336..9508c5a 100644 +--- a/erts/emulator/pcre/pcre_compile.c ++++ b/erts/emulator/pcre/pcre_compile.c +@@ -92,6 +92,11 @@ is 4 there is plenty of room. */ + + #define COMPILE_WORK_SIZE (4096) + ++/* The overrun tests check for a slightly smaller size so that they detect the ++overrun before it actually does run off the end of the data block. */ ++ ++#define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100) ++ + + /* Table for handling escaped characters in the range '0'-'z'. Positive returns + are simple data values; negative values are for special things like \d and so +@@ -2445,7 +2450,7 @@ for (;; ptr++) + #ifdef DEBUG + if (code > cd->hwm) cd->hwm = code; /* High water info */ + #endif +- if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */ ++ if (code > cd->start_workspace + WORK_SIZE_CHECK) /* Check for overrun */ + { + *errorcodeptr = ERR52; + goto FAILED; +@@ -2494,7 +2499,7 @@ for (;; ptr++) + /* In the real compile phase, just check the workspace used by the forward + reference list. */ + +- else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE) ++ else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK) + { + *errorcodeptr = ERR52; + goto FAILED; +-- +1.6.6.1 + diff --git a/otp-0006-Fix-shared-libraries-installation.patch b/otp-0006-Fix-shared-libraries-installation.patch deleted file mode 100644 index 2df3cb4..0000000 --- a/otp-0006-Fix-shared-libraries-installation.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0c963550412174a4c4fe64aa7f70189998abef41 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Thu, 15 Apr 2010 13:31:36 +0400 -Subject: [PATCH 6/9] Fix shared libraries installation - -Several shared libraries (asn1_erl_drv.so, megaco_flex_scanner_drv_mt.so, -megaco_flex_scanner_drv.so, wxe_driver.so) were installed as data files -previously. - -Signed-off-by: Peter Lemenkov ---- - lib/asn1/c_src/Makefile | 2 +- - lib/megaco/src/flex/Makefile.in | 2 +- - lib/wx/c_src/Makefile.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile -index 906c513..9e9cb18 100644 ---- a/lib/asn1/c_src/Makefile -+++ b/lib/asn1/c_src/Makefile -@@ -124,7 +124,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/priv/lib -- $(INSTALL_DATA) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib -+ $(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib - $(INSTALL_DIR) $(RELSYSDIR)/c_src - $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src - -diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index 6ce9b34..5af651d 100644 ---- a/lib/megaco/src/flex/Makefile.in -+++ b/lib/megaco/src/flex/Makefile.in -@@ -280,7 +280,7 @@ release_spec: opt - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) - $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex -- $(INSTALL_DATA) $(SOLIBS) $(RELSYSDIR)/priv/lib -+ $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib - endif - - -diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in -index 5a0b4ce..8710641 100644 ---- a/lib/wx/c_src/Makefile.in -+++ b/lib/wx/c_src/Makefile.in -@@ -167,7 +167,7 @@ release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/priv/$(SYS_TYPE) - $(INSTALL_DATA) ../priv/erlang-logo32.png $(RELSYSDIR)/priv/ - $(INSTALL_DATA) ../priv/erlang-logo64.png $(RELSYSDIR)/priv/ -- $(INSTALL_DATA) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) -+ $(INSTALL_PROGRAM) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) - - release_docs_spec: - --- -1.6.6.1 - diff --git a/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch b/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch deleted file mode 100644 index 5e78c4a..0000000 --- a/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6ffccff36e0d94cba0412cf3a29769b4a19d3be3 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Fri, 16 Apr 2010 21:13:47 +0400 -Subject: [PATCH 7/9] Fix for dlopening libGL and libGLU - -Signed-off-by: Peter Lemenkov ---- - lib/wx/c_src/wxe_gl.cpp | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp -index 63dd68f..36bf15f 100644 ---- a/lib/wx/c_src/wxe_gl.cpp -+++ b/lib/wx/c_src/wxe_gl.cpp -@@ -81,7 +81,7 @@ int initOpenGL() - WCHAR * DLName = wxT("opengl32.dll"); - HMODULE LIBhandle = LoadLibrary(DLName); - #else -- char * DLName = (char *) "libGL.so"; -+ char * DLName = (char *) "libGL.so.1"; - void * LIBhandle = dlopen(DLName, RTLD_LAZY); - #endif - // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); -@@ -132,7 +132,7 @@ int initOpenGL() - DLName = wxT("glu32.dll"); - LIBhandle = LoadLibrary(DLName); - #else -- DLName = (char *) "libGLU.so"; -+ DLName = (char *) "libGLU.so.1"; - LIBhandle = dlopen(DLName, RTLD_LAZY); - #endif - // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); --- -1.6.6.1 - diff --git a/otp-0007-Install-missing-emacs-files.patch b/otp-0007-Install-missing-emacs-files.patch new file mode 100644 index 0000000..389c517 --- /dev/null +++ b/otp-0007-Install-missing-emacs-files.patch @@ -0,0 +1,28 @@ +From 09e0f9ec22f680c759feea2e90913128ce2a249d Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Wed, 28 Apr 2010 14:35:59 +0400 +Subject: [PATCH 7/7] Install missing emacs files + +Signed-off-by: Peter Lemenkov +--- + lib/tools/emacs/Makefile | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/lib/tools/emacs/Makefile b/lib/tools/emacs/Makefile +index 7249263..17978de 100644 +--- a/lib/tools/emacs/Makefile ++++ b/lib/tools/emacs/Makefile +@@ -38,7 +38,10 @@ MAN_FILES= \ + + EMACS_FILES= \ + erlang-start \ ++ erlang-skels-old \ ++ erlang-skels \ + erlang-eunit \ ++ erlang_appwiz \ + erlang + + README_FILES= README +-- +1.6.6.1 + diff --git a/otp-0008-Fix-check-for-compile-workspace-overflow.patch b/otp-0008-Fix-check-for-compile-workspace-overflow.patch deleted file mode 100644 index 2e34451..0000000 --- a/otp-0008-Fix-check-for-compile-workspace-overflow.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d496ce48940411976617b66a5c941c78313cb78c Mon Sep 17 00:00:00 2001 -From: Michael Santos -Date: Thu, 18 Mar 2010 20:08:10 -0400 -Subject: [PATCH 8/9] Fix check for compile workspace overflow - -Patch from: -http://vcs.pcre.org/viewvc/code/trunk/pcre_compile.c?r1=504&r2=505&view=patch - -Test case: -N = 819, re:compile([lists:duplicate(N, $(), lists:duplicate(N, $))]). - -Compiling large regular expressions could overflow the workspace -buffer. Modify the test to check for a value smaller than the buffer -size. ---- - erts/emulator/pcre/pcre_compile.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c -index 2974336..9508c5a 100644 ---- a/erts/emulator/pcre/pcre_compile.c -+++ b/erts/emulator/pcre/pcre_compile.c -@@ -92,6 +92,11 @@ is 4 there is plenty of room. */ - - #define COMPILE_WORK_SIZE (4096) - -+/* The overrun tests check for a slightly smaller size so that they detect the -+overrun before it actually does run off the end of the data block. */ -+ -+#define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100) -+ - - /* Table for handling escaped characters in the range '0'-'z'. Positive returns - are simple data values; negative values are for special things like \d and so -@@ -2445,7 +2450,7 @@ for (;; ptr++) - #ifdef DEBUG - if (code > cd->hwm) cd->hwm = code; /* High water info */ - #endif -- if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */ -+ if (code > cd->start_workspace + WORK_SIZE_CHECK) /* Check for overrun */ - { - *errorcodeptr = ERR52; - goto FAILED; -@@ -2494,7 +2499,7 @@ for (;; ptr++) - /* In the real compile phase, just check the workspace used by the forward - reference list. */ - -- else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE) -+ else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK) - { - *errorcodeptr = ERR52; - goto FAILED; --- -1.6.6.1 - diff --git a/sources b/sources index 9207cc0..2216c4f 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -d69ce51bfabbdd0808461d86dfc95689 otp_doc_html_R13B04.tar.gz -681aaef70affc64743f4e8c0675034af otp_doc_man_R13B04.tar.gz ca6da4921e438891967900aa6a084341 otp_src_R13B04.tar.gz -- cgit From 29bc5e71e6b559c3a310f9d8c3a521bf112faf83 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 6 May 2010 07:36:45 +0000 Subject: Disabled autoimatic adding of requires/provides --- erlang.spec | 317 +++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 263 insertions(+), 54 deletions(-) diff --git a/erlang.spec b/erlang.spec index c59a8ce..991efac 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,11 +1,9 @@ -%{?__erlang_provides_requires: %{__erlang_provides_requires}} - %define ver R13B %define rel 04 Name: erlang Version: %{ver} -Release: %{rel}.9%{?dist} +Release: %{rel}.10%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -110,7 +108,11 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description appmon @@ -119,7 +121,10 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-syntax_tools = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description asn1 @@ -128,7 +133,19 @@ 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} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-debugger = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-snmp = %{version}-%{release} +Requires: %{name}-ssh = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-test_server = %{version}-%{release} +Requires: %{name}-tools = %{version}-%{release} +Requires: %{name}-webtool = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description common_test @@ -137,7 +154,11 @@ 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} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-hipe = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description compiler @@ -146,7 +167,10 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosEvent @@ -155,7 +179,11 @@ Orber OMG Event Service. %package cosEventDomain Summary: Orber OMG Event Domain Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-cosNotification = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosEventDomain @@ -164,7 +192,13 @@ Orber OMG Event Domain Service. %package cosFileTransfer Summary: Orber OMG File Transfer Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-cosProperty = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-ssl = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosFileTransfer @@ -173,7 +207,12 @@ Orber OMG File Transfer Service. %package cosNotification Summary: Orber OMG Notification Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-cosEvent = %{version}-%{release} +Requires: %{name}-cosTime = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosNotification @@ -182,7 +221,11 @@ Orber OMG Notification Service. %package cosProperty Summary: Orber OMG Property Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosProperty @@ -191,7 +234,11 @@ Orber OMG Property Service. %package cosTime Summary: Orber OMG Timer and TimerEvent Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-cosEvent = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosTime @@ -200,7 +247,10 @@ Orber OMG Timer and TimerEvent Service. %package cosTransactions Summary: Orber OMG Transaction Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 Obsoletes: %{name}-cosTransaction < R13B-04.7 @@ -210,7 +260,9 @@ Orber OMG Transaction Service. %package crypto Summary: Cryptographical support Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description crypto @@ -219,7 +271,12 @@ Cryptographical support. %package debugger Summary: A debugger for debugging and testing of Erlang programs Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-wx = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description debugger @@ -228,7 +285,14 @@ 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} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-hipe = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-syntax_tools = %{version}-%{release} +Requires: %{name}-wx = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description dialyzer @@ -247,7 +311,11 @@ Documentation for Erlang. %package docbuilder Summary: Tool for generating HTML documentation for applications Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-edoc = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-xmerl = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description docbuilder @@ -256,7 +324,13 @@ 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} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-syntax_tools = %{version}-%{release} +Requires: %{name}-xmerl = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description edoc @@ -283,6 +357,8 @@ Low level interface to C. %package erts Summary: Functionality necessary to run the Erlang System itself Group: Development/Languages +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description erts @@ -291,7 +367,12 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-wx = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description et @@ -300,7 +381,9 @@ An event tracer for Erlang programs. %package eunit Summary: Support for unit testing Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description eunit @@ -318,7 +401,9 @@ Examples for some Erlang modules. %package gs Summary: A library for Tcl/Tk support in Erlang Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} BuildRequires: tcl-devel BuildRequires: tk-devel Requires: tk @@ -330,7 +415,11 @@ A Graphics System used to write platform independent user interfaces. %package hipe Summary: High Performance Erlang Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-syntax_tools = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description hipe @@ -339,7 +428,9 @@ High Performance Erlang. %package ic Summary: IDL compiler Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description ic @@ -348,7 +439,12 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-ssl = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description inets @@ -357,7 +453,10 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description inviso @@ -376,7 +475,8 @@ Low level interface to Java. %package kernel Summary: Main erlang library Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description kernel @@ -385,7 +485,13 @@ Main erlang library. %package megaco Summary: Megaco/H.248 support library Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-asn1 = %{version}-%{release} +Requires: %{name}-debugger = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-et = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description megaco @@ -396,7 +502,9 @@ from media conversion. %package mnesia Summary: A heavy duty real-time distributed database Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description mnesia @@ -405,7 +513,14 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-et = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-webtool = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description observer @@ -414,7 +529,9 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 BuildRequires: unixODBC-devel @@ -425,7 +542,12 @@ Connectivity). %package orber Summary: A CORBA Object Request Broker Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-ssl = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description orber @@ -434,7 +556,13 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-otp_mibs = %{version}-%{release} +Requires: %{name}-sasl = %{version}-%{release} +Requires: %{name}-snmp = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description os_mon @@ -443,7 +571,11 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-snmp = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description otp_mibs @@ -452,7 +584,9 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description parsetools @@ -461,7 +595,11 @@ A set of parsing and lexical analysis tools. %package percept Summary: A concurrency profiler tool Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description percept @@ -470,7 +608,10 @@ A concurrency profiler tool. %package pman Summary: A graphical process manager used to inspect Erlang processes Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description pman @@ -479,7 +620,10 @@ 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} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description public_key @@ -488,7 +632,13 @@ API to public key infrastructure. %package reltool Summary: A release management tool Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-sasl = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-syntax_tools = %{version}-%{release} +Requires: %{name}-tools = %{version}-%{release} +Requires: %{name}-wx = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description reltool @@ -510,7 +660,9 @@ Necessary macros for building Erlang. %package runtime_tools Summary: A set of tools to include in a production system Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description runtime_tools @@ -519,7 +671,10 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-tools = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description sasl @@ -529,7 +684,12 @@ release upgrades and alarm handling etc. %package snmp Summary: Simple Network Management Protocol (SNMP) support Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description snmp @@ -539,7 +699,11 @@ 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} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-public_key = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description ssh @@ -548,7 +712,11 @@ Secure Shell application with sftp and ssh support. %package ssl Summary: Secure Socket Layer support Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-public_key = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description ssl @@ -557,7 +725,10 @@ Secure Socket Layer support. %package stdlib Summary: The Erlang standard libraries Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description stdlib @@ -566,7 +737,9 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description syntax_tools @@ -576,7 +749,13 @@ reading source files differently, pretty-printing syntax trees. %package test_server Summary: The OTP Test Server Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-observer = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-sasl = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-tools = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description test_server @@ -585,7 +764,10 @@ The OTP Test Server. %package toolbar Summary: A tool bar simplifying access to the Erlang tools Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description toolbar @@ -594,7 +776,13 @@ 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} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-webtool = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description tools @@ -603,7 +791,12 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-pman = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description tv @@ -612,7 +805,12 @@ An ETS and MNESIA graphical table visualizer. %package typer Summary: TYPe annotator for ERlang programs Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-dialyzer = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-hipe = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description typer @@ -621,7 +819,11 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-observer = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description webtool @@ -630,7 +832,9 @@ 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: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Requires: mesa-libGL Requires: mesa-libGLU Obsoletes: %{name} < R13B-04.5 @@ -642,7 +846,9 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description xmerl @@ -1717,6 +1923,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 6 2010 Peter Lemenkov - R13B-04.10 +- Disabled automatic requires/provides generation + * Wed Apr 28 2010 Peter Lemenkov - R13B-04.9 - Added missing files, necessary for emacs (see rhbz #585349) - Patches rebased -- cgit From 1ede232b3d9d9ce9ad26db9daa51988d433fcc49 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 6 May 2010 07:36:45 +0000 Subject: Disabled autoimatic adding of requires/provides --- erlang.spec | 317 +++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 263 insertions(+), 54 deletions(-) diff --git a/erlang.spec b/erlang.spec index c59a8ce..991efac 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,11 +1,9 @@ -%{?__erlang_provides_requires: %{__erlang_provides_requires}} - %define ver R13B %define rel 04 Name: erlang Version: %{ver} -Release: %{rel}.9%{?dist} +Release: %{rel}.10%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -110,7 +108,11 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description appmon @@ -119,7 +121,10 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-syntax_tools = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description asn1 @@ -128,7 +133,19 @@ 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} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-debugger = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-snmp = %{version}-%{release} +Requires: %{name}-ssh = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-test_server = %{version}-%{release} +Requires: %{name}-tools = %{version}-%{release} +Requires: %{name}-webtool = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description common_test @@ -137,7 +154,11 @@ 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} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-hipe = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description compiler @@ -146,7 +167,10 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosEvent @@ -155,7 +179,11 @@ Orber OMG Event Service. %package cosEventDomain Summary: Orber OMG Event Domain Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-cosNotification = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosEventDomain @@ -164,7 +192,13 @@ Orber OMG Event Domain Service. %package cosFileTransfer Summary: Orber OMG File Transfer Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-cosProperty = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-ssl = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosFileTransfer @@ -173,7 +207,12 @@ Orber OMG File Transfer Service. %package cosNotification Summary: Orber OMG Notification Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-cosEvent = %{version}-%{release} +Requires: %{name}-cosTime = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosNotification @@ -182,7 +221,11 @@ Orber OMG Notification Service. %package cosProperty Summary: Orber OMG Property Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosProperty @@ -191,7 +234,11 @@ Orber OMG Property Service. %package cosTime Summary: Orber OMG Timer and TimerEvent Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-cosEvent = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosTime @@ -200,7 +247,10 @@ Orber OMG Timer and TimerEvent Service. %package cosTransactions Summary: Orber OMG Transaction Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 Obsoletes: %{name}-cosTransaction < R13B-04.7 @@ -210,7 +260,9 @@ Orber OMG Transaction Service. %package crypto Summary: Cryptographical support Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description crypto @@ -219,7 +271,12 @@ Cryptographical support. %package debugger Summary: A debugger for debugging and testing of Erlang programs Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-wx = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description debugger @@ -228,7 +285,14 @@ 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} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-hipe = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-syntax_tools = %{version}-%{release} +Requires: %{name}-wx = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description dialyzer @@ -247,7 +311,11 @@ Documentation for Erlang. %package docbuilder Summary: Tool for generating HTML documentation for applications Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-edoc = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-xmerl = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description docbuilder @@ -256,7 +324,13 @@ 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} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-syntax_tools = %{version}-%{release} +Requires: %{name}-xmerl = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description edoc @@ -283,6 +357,8 @@ Low level interface to C. %package erts Summary: Functionality necessary to run the Erlang System itself Group: Development/Languages +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description erts @@ -291,7 +367,12 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-wx = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description et @@ -300,7 +381,9 @@ An event tracer for Erlang programs. %package eunit Summary: Support for unit testing Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description eunit @@ -318,7 +401,9 @@ Examples for some Erlang modules. %package gs Summary: A library for Tcl/Tk support in Erlang Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} BuildRequires: tcl-devel BuildRequires: tk-devel Requires: tk @@ -330,7 +415,11 @@ A Graphics System used to write platform independent user interfaces. %package hipe Summary: High Performance Erlang Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-syntax_tools = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description hipe @@ -339,7 +428,9 @@ High Performance Erlang. %package ic Summary: IDL compiler Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description ic @@ -348,7 +439,12 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-ssl = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description inets @@ -357,7 +453,10 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description inviso @@ -376,7 +475,8 @@ Low level interface to Java. %package kernel Summary: Main erlang library Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description kernel @@ -385,7 +485,13 @@ Main erlang library. %package megaco Summary: Megaco/H.248 support library Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-asn1 = %{version}-%{release} +Requires: %{name}-debugger = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-et = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description megaco @@ -396,7 +502,9 @@ from media conversion. %package mnesia Summary: A heavy duty real-time distributed database Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description mnesia @@ -405,7 +513,14 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-et = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-webtool = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description observer @@ -414,7 +529,9 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 BuildRequires: unixODBC-devel @@ -425,7 +542,12 @@ Connectivity). %package orber Summary: A CORBA Object Request Broker Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-ssl = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description orber @@ -434,7 +556,13 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-otp_mibs = %{version}-%{release} +Requires: %{name}-sasl = %{version}-%{release} +Requires: %{name}-snmp = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description os_mon @@ -443,7 +571,11 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-snmp = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description otp_mibs @@ -452,7 +584,9 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description parsetools @@ -461,7 +595,11 @@ A set of parsing and lexical analysis tools. %package percept Summary: A concurrency profiler tool Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description percept @@ -470,7 +608,10 @@ A concurrency profiler tool. %package pman Summary: A graphical process manager used to inspect Erlang processes Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description pman @@ -479,7 +620,10 @@ 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} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description public_key @@ -488,7 +632,13 @@ API to public key infrastructure. %package reltool Summary: A release management tool Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-sasl = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-syntax_tools = %{version}-%{release} +Requires: %{name}-tools = %{version}-%{release} +Requires: %{name}-wx = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description reltool @@ -510,7 +660,9 @@ Necessary macros for building Erlang. %package runtime_tools Summary: A set of tools to include in a production system Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description runtime_tools @@ -519,7 +671,10 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-tools = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description sasl @@ -529,7 +684,12 @@ release upgrades and alarm handling etc. %package snmp Summary: Simple Network Management Protocol (SNMP) support Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description snmp @@ -539,7 +699,11 @@ 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} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-public_key = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description ssh @@ -548,7 +712,11 @@ Secure Shell application with sftp and ssh support. %package ssl Summary: Secure Socket Layer support Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-public_key = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description ssl @@ -557,7 +725,10 @@ Secure Socket Layer support. %package stdlib Summary: The Erlang standard libraries Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description stdlib @@ -566,7 +737,9 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description syntax_tools @@ -576,7 +749,13 @@ reading source files differently, pretty-printing syntax trees. %package test_server Summary: The OTP Test Server Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-observer = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-sasl = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-tools = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description test_server @@ -585,7 +764,10 @@ The OTP Test Server. %package toolbar Summary: A tool bar simplifying access to the Erlang tools Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description toolbar @@ -594,7 +776,13 @@ 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} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-webtool = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description tools @@ -603,7 +791,12 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-pman = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description tv @@ -612,7 +805,12 @@ An ETS and MNESIA graphical table visualizer. %package typer Summary: TYPe annotator for ERlang programs Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-dialyzer = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-hipe = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description typer @@ -621,7 +819,11 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-observer = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description webtool @@ -630,7 +832,9 @@ 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: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Requires: mesa-libGL Requires: mesa-libGLU Obsoletes: %{name} < R13B-04.5 @@ -642,7 +846,9 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description xmerl @@ -1717,6 +1923,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 6 2010 Peter Lemenkov - R13B-04.10 +- Disabled automatic requires/provides generation + * Wed Apr 28 2010 Peter Lemenkov - R13B-04.9 - Added missing files, necessary for emacs (see rhbz #585349) - Patches rebased -- cgit From 80ff2026639e16e5921c0f9aaf4cc256bc062f1b Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 6 May 2010 07:36:45 +0000 Subject: Disabled autoimatic adding of requires/provides --- erlang.spec | 317 +++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 263 insertions(+), 54 deletions(-) diff --git a/erlang.spec b/erlang.spec index c59a8ce..991efac 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,11 +1,9 @@ -%{?__erlang_provides_requires: %{__erlang_provides_requires}} - %define ver R13B %define rel 04 Name: erlang Version: %{ver} -Release: %{rel}.9%{?dist} +Release: %{rel}.10%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -110,7 +108,11 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description appmon @@ -119,7 +121,10 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-syntax_tools = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description asn1 @@ -128,7 +133,19 @@ 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} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-debugger = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-snmp = %{version}-%{release} +Requires: %{name}-ssh = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-test_server = %{version}-%{release} +Requires: %{name}-tools = %{version}-%{release} +Requires: %{name}-webtool = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description common_test @@ -137,7 +154,11 @@ 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} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-hipe = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description compiler @@ -146,7 +167,10 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosEvent @@ -155,7 +179,11 @@ Orber OMG Event Service. %package cosEventDomain Summary: Orber OMG Event Domain Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-cosNotification = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosEventDomain @@ -164,7 +192,13 @@ Orber OMG Event Domain Service. %package cosFileTransfer Summary: Orber OMG File Transfer Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-cosProperty = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-ssl = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosFileTransfer @@ -173,7 +207,12 @@ Orber OMG File Transfer Service. %package cosNotification Summary: Orber OMG Notification Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-cosEvent = %{version}-%{release} +Requires: %{name}-cosTime = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosNotification @@ -182,7 +221,11 @@ Orber OMG Notification Service. %package cosProperty Summary: Orber OMG Property Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosProperty @@ -191,7 +234,11 @@ Orber OMG Property Service. %package cosTime Summary: Orber OMG Timer and TimerEvent Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-cosEvent = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosTime @@ -200,7 +247,10 @@ Orber OMG Timer and TimerEvent Service. %package cosTransactions Summary: Orber OMG Transaction Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 Obsoletes: %{name}-cosTransaction < R13B-04.7 @@ -210,7 +260,9 @@ Orber OMG Transaction Service. %package crypto Summary: Cryptographical support Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description crypto @@ -219,7 +271,12 @@ Cryptographical support. %package debugger Summary: A debugger for debugging and testing of Erlang programs Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-wx = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description debugger @@ -228,7 +285,14 @@ 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} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-hipe = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-syntax_tools = %{version}-%{release} +Requires: %{name}-wx = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description dialyzer @@ -247,7 +311,11 @@ Documentation for Erlang. %package docbuilder Summary: Tool for generating HTML documentation for applications Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-edoc = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-xmerl = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description docbuilder @@ -256,7 +324,13 @@ 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} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-syntax_tools = %{version}-%{release} +Requires: %{name}-xmerl = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description edoc @@ -283,6 +357,8 @@ Low level interface to C. %package erts Summary: Functionality necessary to run the Erlang System itself Group: Development/Languages +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description erts @@ -291,7 +367,12 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-wx = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description et @@ -300,7 +381,9 @@ An event tracer for Erlang programs. %package eunit Summary: Support for unit testing Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description eunit @@ -318,7 +401,9 @@ Examples for some Erlang modules. %package gs Summary: A library for Tcl/Tk support in Erlang Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} BuildRequires: tcl-devel BuildRequires: tk-devel Requires: tk @@ -330,7 +415,11 @@ A Graphics System used to write platform independent user interfaces. %package hipe Summary: High Performance Erlang Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-syntax_tools = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description hipe @@ -339,7 +428,9 @@ High Performance Erlang. %package ic Summary: IDL compiler Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description ic @@ -348,7 +439,12 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-ssl = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description inets @@ -357,7 +453,10 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description inviso @@ -376,7 +475,8 @@ Low level interface to Java. %package kernel Summary: Main erlang library Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description kernel @@ -385,7 +485,13 @@ Main erlang library. %package megaco Summary: Megaco/H.248 support library Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-asn1 = %{version}-%{release} +Requires: %{name}-debugger = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-et = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description megaco @@ -396,7 +502,9 @@ from media conversion. %package mnesia Summary: A heavy duty real-time distributed database Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description mnesia @@ -405,7 +513,14 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-et = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-webtool = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description observer @@ -414,7 +529,9 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 BuildRequires: unixODBC-devel @@ -425,7 +542,12 @@ Connectivity). %package orber Summary: A CORBA Object Request Broker Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-ssl = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description orber @@ -434,7 +556,13 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-otp_mibs = %{version}-%{release} +Requires: %{name}-sasl = %{version}-%{release} +Requires: %{name}-snmp = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description os_mon @@ -443,7 +571,11 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-snmp = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description otp_mibs @@ -452,7 +584,9 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description parsetools @@ -461,7 +595,11 @@ A set of parsing and lexical analysis tools. %package percept Summary: A concurrency profiler tool Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description percept @@ -470,7 +608,10 @@ A concurrency profiler tool. %package pman Summary: A graphical process manager used to inspect Erlang processes Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description pman @@ -479,7 +620,10 @@ 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} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description public_key @@ -488,7 +632,13 @@ API to public key infrastructure. %package reltool Summary: A release management tool Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-sasl = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-syntax_tools = %{version}-%{release} +Requires: %{name}-tools = %{version}-%{release} +Requires: %{name}-wx = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description reltool @@ -510,7 +660,9 @@ Necessary macros for building Erlang. %package runtime_tools Summary: A set of tools to include in a production system Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description runtime_tools @@ -519,7 +671,10 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-tools = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description sasl @@ -529,7 +684,12 @@ release upgrades and alarm handling etc. %package snmp Summary: Simple Network Management Protocol (SNMP) support Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description snmp @@ -539,7 +699,11 @@ 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} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-public_key = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description ssh @@ -548,7 +712,11 @@ Secure Shell application with sftp and ssh support. %package ssl Summary: Secure Socket Layer support Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-public_key = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description ssl @@ -557,7 +725,10 @@ Secure Socket Layer support. %package stdlib Summary: The Erlang standard libraries Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description stdlib @@ -566,7 +737,9 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description syntax_tools @@ -576,7 +749,13 @@ reading source files differently, pretty-printing syntax trees. %package test_server Summary: The OTP Test Server Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-observer = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-sasl = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-tools = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description test_server @@ -585,7 +764,10 @@ The OTP Test Server. %package toolbar Summary: A tool bar simplifying access to the Erlang tools Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description toolbar @@ -594,7 +776,13 @@ 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} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-webtool = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description tools @@ -603,7 +791,12 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-pman = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description tv @@ -612,7 +805,12 @@ An ETS and MNESIA graphical table visualizer. %package typer Summary: TYPe annotator for ERlang programs Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-dialyzer = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-hipe = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description typer @@ -621,7 +819,11 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-observer = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description webtool @@ -630,7 +832,9 @@ 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: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Requires: mesa-libGL Requires: mesa-libGLU Obsoletes: %{name} < R13B-04.5 @@ -642,7 +846,9 @@ 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} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description xmerl @@ -1717,6 +1923,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 6 2010 Peter Lemenkov - R13B-04.10 +- Disabled automatic requires/provides generation + * Wed Apr 28 2010 Peter Lemenkov - R13B-04.9 - Added missing files, necessary for emacs (see rhbz #585349) - Patches rebased -- cgit From 0f4f04b1e594488e47c719e56524163ef72d3b3f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 01:48:35 +0000 Subject: Initialize branch EL-6 for erlang --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 -- cgit From bf60de880dfa4b075ff0ae1533271977c1eb2563 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 14 May 2010 12:55:39 +0000 Subject: Do not mention nteventlog in os_mon.app (rhbz #592251) --- erlang.spec | 11 ++++++++--- import.log | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 991efac..2deedb8 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.10%{?dist} +Release: %{rel}.11%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -38,7 +38,7 @@ BuildRequires: flex BuildRequires: m4 BuildRequires: fop BuildRequires: libxslt -# Required for erlang-rpm-macros +# Required for building docs (escript) BuildRequires: erlang Requires: erlang-appmon = %{version}-%{release} @@ -913,6 +913,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/erlsrv.* rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/werl.* rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/nteventlog.* rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/win32reg.* +# Do not mention nteventlog in os_mon.app, see rhbz #592251 +sed -i "s,\,\s*nteventlog,," $RPM_BUILD_ROOT%{_libdir}/erlang/lib/os_mon-*/ebin/os_mon.app # VxWorks specific rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/erl_set_memory_block.* @@ -1184,7 +1186,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/erlang/releases/ %{_bindir}/* -%{_libdir}/erlang/bin/ +%{_libdir}/erlang/bin/* %{_libdir}/erlang/erts-*/ %{_libdir}/erlang/lib/erts-*/ %{_libdir}/erlang/man/man1/epmd.* @@ -1923,6 +1925,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 14 2010 Peter Lemenkov - R13B-04.11 +- Do not mention nteventlog in os_mon.app, see rhbz #592251 + * Thu May 6 2010 Peter Lemenkov - R13B-04.10 - Disabled automatic requires/provides generation diff --git a/import.log b/import.log index 691638c..c799055 100644 --- a/import.log +++ b/import.log @@ -5,3 +5,4 @@ erlang-R13B-04_4_fc12:F-13:erlang-R13B-04.4.fc12.src.rpm:1271523813 erlang-R13B-04_5_fc12:F-13:erlang-R13B-04.5.fc12.src.rpm:1272271184 erlang-R13B-04_6_fc12:F-13:erlang-R13B-04.6.fc12.src.rpm:1272303676 erlang-R13B-04_9_fc12:F-13:erlang-R13B-04.9.fc12.src.rpm:1272528169 +erlang-R13B-04_11_fc12:F-13:erlang-R13B-04.11.fc12.src.rpm:1273841704 -- cgit From bd415d91617256d36e5fe739fae8e76852a351c8 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 14 May 2010 12:56:42 +0000 Subject: Do not mention nteventlog in os_mon.app (rhbz #592251) --- erlang.spec | 11 ++++++++--- import.log | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 991efac..2deedb8 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.10%{?dist} +Release: %{rel}.11%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -38,7 +38,7 @@ BuildRequires: flex BuildRequires: m4 BuildRequires: fop BuildRequires: libxslt -# Required for erlang-rpm-macros +# Required for building docs (escript) BuildRequires: erlang Requires: erlang-appmon = %{version}-%{release} @@ -913,6 +913,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/erlsrv.* rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/werl.* rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/nteventlog.* rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/win32reg.* +# Do not mention nteventlog in os_mon.app, see rhbz #592251 +sed -i "s,\,\s*nteventlog,," $RPM_BUILD_ROOT%{_libdir}/erlang/lib/os_mon-*/ebin/os_mon.app # VxWorks specific rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/erl_set_memory_block.* @@ -1184,7 +1186,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/erlang/releases/ %{_bindir}/* -%{_libdir}/erlang/bin/ +%{_libdir}/erlang/bin/* %{_libdir}/erlang/erts-*/ %{_libdir}/erlang/lib/erts-*/ %{_libdir}/erlang/man/man1/epmd.* @@ -1923,6 +1925,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 14 2010 Peter Lemenkov - R13B-04.11 +- Do not mention nteventlog in os_mon.app, see rhbz #592251 + * Thu May 6 2010 Peter Lemenkov - R13B-04.10 - Disabled automatic requires/provides generation diff --git a/import.log b/import.log index 69b579b..264f6a2 100644 --- a/import.log +++ b/import.log @@ -5,3 +5,4 @@ erlang-R13B-04_4_fc12:F-12:erlang-R13B-04.4.fc12.src.rpm:1271523892 erlang-R13B-04_5_fc12:F-12:erlang-R13B-04.5.fc12.src.rpm:1272271343 erlang-R13B-04_6_fc12:F-12:erlang-R13B-04.6.fc12.src.rpm:1272303739 erlang-R13B-04_9_fc12:F-12:erlang-R13B-04.9.fc12.src.rpm:1272528494 +erlang-R13B-04_11_fc12:F-12:erlang-R13B-04.11.fc12.src.rpm:1273841768 -- cgit From 613b0c6ae44d02734a0d1d8f61426dbf27165553 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 14 May 2010 12:57:46 +0000 Subject: Do not mention nteventlog in os_mon.app (rhbz #592251) --- erlang.spec | 11 ++++++++--- import.log | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 991efac..2deedb8 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.10%{?dist} +Release: %{rel}.11%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -38,7 +38,7 @@ BuildRequires: flex BuildRequires: m4 BuildRequires: fop BuildRequires: libxslt -# Required for erlang-rpm-macros +# Required for building docs (escript) BuildRequires: erlang Requires: erlang-appmon = %{version}-%{release} @@ -913,6 +913,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/erlsrv.* rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/werl.* rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/nteventlog.* rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/win32reg.* +# Do not mention nteventlog in os_mon.app, see rhbz #592251 +sed -i "s,\,\s*nteventlog,," $RPM_BUILD_ROOT%{_libdir}/erlang/lib/os_mon-*/ebin/os_mon.app # VxWorks specific rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/erl_set_memory_block.* @@ -1184,7 +1186,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/erlang/releases/ %{_bindir}/* -%{_libdir}/erlang/bin/ +%{_libdir}/erlang/bin/* %{_libdir}/erlang/erts-*/ %{_libdir}/erlang/lib/erts-*/ %{_libdir}/erlang/man/man1/epmd.* @@ -1923,6 +1925,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 14 2010 Peter Lemenkov - R13B-04.11 +- Do not mention nteventlog in os_mon.app, see rhbz #592251 + * Thu May 6 2010 Peter Lemenkov - R13B-04.10 - Disabled automatic requires/provides generation diff --git a/import.log b/import.log index 69b579b..ff28804 100644 --- a/import.log +++ b/import.log @@ -5,3 +5,4 @@ erlang-R13B-04_4_fc12:F-12:erlang-R13B-04.4.fc12.src.rpm:1271523892 erlang-R13B-04_5_fc12:F-12:erlang-R13B-04.5.fc12.src.rpm:1272271343 erlang-R13B-04_6_fc12:F-12:erlang-R13B-04.6.fc12.src.rpm:1272303739 erlang-R13B-04_9_fc12:F-12:erlang-R13B-04.9.fc12.src.rpm:1272528494 +erlang-R13B-04_11_fc12:EL-6:erlang-R13B-04.11.fc12.src.rpm:1273841835 -- cgit From 58c8b2bfbfedc9122301e0e96e11aaec92675013 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 14 May 2010 14:17:01 +0000 Subject: bootstrap erlang --- erlang.spec | 642 ++---------------------------------------------------------- 1 file changed, 15 insertions(+), 627 deletions(-) diff --git a/erlang.spec b/erlang.spec index 2deedb8..cdb842a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.11%{?dist} +Release: %{rel}.11%{?dist}.1 Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -39,7 +39,7 @@ BuildRequires: m4 BuildRequires: fop BuildRequires: libxslt # Required for building docs (escript) -BuildRequires: erlang +#BuildRequires: erlang Requires: erlang-appmon = %{version}-%{release} Requires: erlang-asn1 = %{version}-%{release} @@ -873,13 +873,13 @@ CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enabl CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib %endif make -make docs +#make docs %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -make DESTDIR=$RPM_BUILD_ROOT install-docs +#make DESTDIR=$RPM_BUILD_ROOT install-docs # fix 0775 permission on some directories find $RPM_BUILD_ROOT%{_libdir}/erlang -type d -perm 0775 | xargs chmod 755 @@ -891,14 +891,14 @@ chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/Makefile chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/src/Makefile # Relocate doc-files into the proper directory -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib -pushd . -cd $RPM_BUILD_ROOT%{_libdir}/erlang -mv -v doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} -for i in erts-* ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/$i ; done -cd $RPM_BUILD_ROOT%{_libdir}/erlang/lib -for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib/$i || true ; done -popd +#mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib +#pushd . +#cd $RPM_BUILD_ROOT%{_libdir}/erlang +#mv -v doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +#for i in erts-* ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/$i ; done +#cd $RPM_BUILD_ROOT%{_libdir}/erlang/lib +#for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib/$i || true ; done +#popd cp -av AUTHORS EPLICENCE README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} @@ -981,7 +981,6 @@ rm -rf $RPM_BUILD_ROOT %files appmon %defattr(-,root,root) %{_libdir}/erlang/lib/appmon-*/ -%{_libdir}/erlang/man/man3/appmon.* %files asn1 %defattr(-,root,root) @@ -989,167 +988,69 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/asn1-*/ebin %{_libdir}/erlang/lib/asn1-*/priv %{_libdir}/erlang/lib/asn1-*/src -%{_libdir}/erlang/man/man3/asn1ct.* -%{_libdir}/erlang/man/man3/asn1rt.* %files common_test %defattr(-,root,root) %{_libdir}/erlang/lib/common_test-*/ -%{_libdir}/erlang/man/man1/run_test.* -%{_libdir}/erlang/man/man3/ct.* -%{_libdir}/erlang/man/man3/ct_cover.* -%{_libdir}/erlang/man/man3/ct_ftp.* -%{_libdir}/erlang/man/man3/ct_master.* -%{_libdir}/erlang/man/man3/ct_rpc.* -%{_libdir}/erlang/man/man3/ct_snmp.* -%{_libdir}/erlang/man/man3/ct_ssh.* -%{_libdir}/erlang/man/man3/ct_telnet.* -%{_libdir}/erlang/man/man3/unix_telnet.* -%{_libdir}/erlang/man/man6/common_test.* %files compiler %defattr(-,root,root) %{_libdir}/erlang/lib/compiler-*/ -%{_libdir}/erlang/man/man3/compile.* %files cosEvent %defattr(-,root,root) %{_libdir}/erlang/lib/cosEvent-*/ -%{_libdir}/erlang/man/man3/cosEventApp.* -%{_libdir}/erlang/man/man3/CosEventChannelAdmin.* -%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ConsumerAdmin.* -%{_libdir}/erlang/man/man3/CosEventChannelAdmin_EventChannel.* -%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPullConsumer.* -%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPullSupplier.* -%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPushConsumer.* -%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPushSupplier.* -%{_libdir}/erlang/man/man3/CosEventChannelAdmin_SupplierAdmin.* %files cosEventDomain %defattr(-,root,root) %{_libdir}/erlang/lib/cosEventDomain-*/ -%{_libdir}/erlang/man/man3/CosEventDomainAdmin.* -%{_libdir}/erlang/man/man3/CosEventDomainAdmin_EventDomain.* -%{_libdir}/erlang/man/man3/CosEventDomainAdmin_EventDomainFactory.* -%{_libdir}/erlang/man/man3/cosEventDomainApp.* %files cosFileTransfer %defattr(-,root,root) %{_libdir}/erlang/lib/cosFileTransfer-*/ -%{_libdir}/erlang/man/man3/cosFileTransferApp.* -%{_libdir}/erlang/man/man3/CosFileTransfer_Directory.* -%{_libdir}/erlang/man/man3/CosFileTransfer_File.* -%{_libdir}/erlang/man/man3/CosFileTransfer_FileIterator.* -%{_libdir}/erlang/man/man3/CosFileTransfer_FileTransferSession.* -%{_libdir}/erlang/man/man3/CosFileTransfer_VirtualFileSystem.* %files cosNotification %defattr(-,root,root) %{_libdir}/erlang/lib/cosNotification-*/ -%{_libdir}/erlang/man/man3/CosNotification.* -%{_libdir}/erlang/man/man3/CosNotification_AdminPropertiesAdmin.* -%{_libdir}/erlang/man/man3/cosNotificationApp.* -%{_libdir}/erlang/man/man3/CosNotification_QoSAdmin.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ConsumerAdmin.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_EventChannel.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_EventChannelFactory.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyConsumer.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPullConsumer.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPullSupplier.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPushConsumer.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPushSupplier.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxySupplier.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPullConsumer.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPullSupplier.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPushConsumer.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPushSupplier.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPullConsumer.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPullSupplier.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPushConsumer.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPushSupplier.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SupplierAdmin.* -%{_libdir}/erlang/man/man3/CosNotifyComm_NotifyPublish.* -%{_libdir}/erlang/man/man3/CosNotifyComm_NotifySubscribe.* -%{_libdir}/erlang/man/man3/CosNotifyFilter_Filter.* -%{_libdir}/erlang/man/man3/CosNotifyFilter_FilterAdmin.* -%{_libdir}/erlang/man/man3/CosNotifyFilter_FilterFactory.* -%{_libdir}/erlang/man/man3/CosNotifyFilter_MappingFilter.* %files cosProperty %defattr(-,root,root) %{_libdir}/erlang/lib/cosProperty-*/ -%{_libdir}/erlang/man/man3/cosProperty.* -%{_libdir}/erlang/man/man3/CosPropertyService_PropertiesIterator.* -%{_libdir}/erlang/man/man3/CosPropertyService_PropertyNamesIterator.* -%{_libdir}/erlang/man/man3/CosPropertyService_PropertySet.* -%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetDef.* -%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetDefFactory.* -%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetFactory.* %files cosTime %defattr(-,root,root) %{_libdir}/erlang/lib/cosTime-*/ -%{_libdir}/erlang/man/man3/cosTime.* -%{_libdir}/erlang/man/man3/CosTimerEvent_TimerEventHandler.* -%{_libdir}/erlang/man/man3/CosTimerEvent_TimerEventService.* -%{_libdir}/erlang/man/man3/CosTime_TimeService.* -%{_libdir}/erlang/man/man3/CosTime_TIO.* -%{_libdir}/erlang/man/man3/CosTime_UTO.* %files cosTransactions %defattr(-,root,root) %{_libdir}/erlang/lib/cosTransactions-*/ -%{_libdir}/erlang/man/man3/cosTransactions.* -%{_libdir}/erlang/man/man3/CosTransactions_Control.* -%{_libdir}/erlang/man/man3/CosTransactions_Coordinator.* -%{_libdir}/erlang/man/man3/CosTransactions_RecoveryCoordinator.* -%{_libdir}/erlang/man/man3/CosTransactions_Resource.* -%{_libdir}/erlang/man/man3/CosTransactions_SubtransactionAwareResource.* -%{_libdir}/erlang/man/man3/CosTransactions_Terminator.* -%{_libdir}/erlang/man/man3/CosTransactions_TransactionFactory.* %files crypto %defattr(-,root,root) %{_libdir}/erlang/lib/crypto-*/ -%{_libdir}/erlang/man/man3/crypto.* -%{_libdir}/erlang/man/man6/crypto.* %files debugger %defattr(-,root,root) %{_libdir}/erlang/lib/debugger-*/ -%{_libdir}/erlang/man/man3/debugger.* -%{_libdir}/erlang/man/man3/i.* -%{_libdir}/erlang/man/man3/int.* %files dialyzer %defattr(-,root,root) %{_libdir}/erlang/lib/dialyzer-*/ -%{_libdir}/erlang/man/man3/dialyzer.* %files doc %defattr(-,root,root) -%doc %{_docdir}/%{name}-%{ver}-%{rel}/doc -%doc %{_docdir}/%{name}-%{ver}-%{rel}/erts-*/ -%doc %{_docdir}/%{name}-%{ver}-%{rel}/lib/ +#doc %{_docdir}/%{name}-%{ver}-%{rel}/doc +#doc %{_docdir}/%{name}-%{ver}-%{rel}/erts-*/ +#doc %{_docdir}/%{name}-%{ver}-%{rel}/lib/ %files docbuilder %defattr(-,root,root) %{_libdir}/erlang/lib/docbuilder-*/ -%{_libdir}/erlang/man/man3/docb_gen.* -%{_libdir}/erlang/man/man3/docb_transform.* -%{_libdir}/erlang/man/man3/docb_xml_check.* -%{_libdir}/erlang/man/man6/docbuilder.* %files edoc %defattr(-,root,root) %{_libdir}/erlang/lib/edoc-*/ -%{_libdir}/erlang/man/man3/edoc.* -%{_libdir}/erlang/man/man3/edoc_doclet.* -%{_libdir}/erlang/man/man3/edoc_extract.* -%{_libdir}/erlang/man/man3/edoc_layout.* -%{_libdir}/erlang/man/man3/edoc_lib.* -%{_libdir}/erlang/man/man3/edoc_run.* %files erl_docgen %defattr(-,root,root) @@ -1158,17 +1059,6 @@ rm -rf $RPM_BUILD_ROOT %files erl_interface %defattr(-,root,root) %{_libdir}/erlang/lib/erl_interface-*/ -%{_libdir}/erlang/man/man1/erl_call.* -%{_libdir}/erlang/man/man3/ei.* -%{_libdir}/erlang/man/man3/ei_connect.* -%{_libdir}/erlang/man/man3/erl_connect.* -%{_libdir}/erlang/man/man3/erl_error.* -%{_libdir}/erlang/man/man3/erl_eterm.* -%{_libdir}/erlang/man/man3/erl_format.* -%{_libdir}/erlang/man/man3/erl_global.* -%{_libdir}/erlang/man/man3/erl_malloc.* -%{_libdir}/erlang/man/man3/erl_marshal.* -%{_libdir}/erlang/man/man3/registry.* %files erts %defattr(-,root,root) @@ -1189,20 +1079,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/bin/* %{_libdir}/erlang/erts-*/ %{_libdir}/erlang/lib/erts-*/ -%{_libdir}/erlang/man/man1/epmd.* -%{_libdir}/erlang/man/man1/erl.* -%{_libdir}/erlang/man/man1/erlc.* -%{_libdir}/erlang/man/man1/escript.* -%{_libdir}/erlang/man/man1/run_erl.* -%{_libdir}/erlang/man/man1/start.* -%{_libdir}/erlang/man/man1/start_erl.* -%{_libdir}/erlang/man/man3/driver_entry.* -%{_libdir}/erlang/man/man3/erl_driver.* -%{_libdir}/erlang/man/man3/erl_prim_loader.* -%{_libdir}/erlang/man/man3/erlang.* -%{_libdir}/erlang/man/man3/erts_alloc.* -%{_libdir}/erlang/man/man3/init.* -%{_libdir}/erlang/man/man3/zlib.* %{_libdir}/erlang/releases/* %{_libdir}/erlang/usr/ @@ -1212,18 +1088,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/et-*/ebin %{_libdir}/erlang/lib/et-*/include %{_libdir}/erlang/lib/et-*/src -%{_libdir}/erlang/man/man3/et.* -%{_libdir}/erlang/man/man3/et_collector.* -%{_libdir}/erlang/man/man3/et_selector.* -%{_libdir}/erlang/man/man3/et_viewer.* %files eunit %defattr(-,root,root) %dir %{_libdir}/erlang/lib/eunit-*/ %{_libdir}/erlang/lib/eunit-*/ebin %{_libdir}/erlang/lib/eunit-*/include -%{_libdir}/erlang/man/man3/eunit.* -%{_libdir}/erlang/man/man3/eunit_surefire.* %files examples %defattr(-,root,root) @@ -1252,7 +1122,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/gs-*/ebin %{_libdir}/erlang/lib/gs-*/priv %{_libdir}/erlang/lib/gs-*/src -%{_libdir}/erlang/man/man3/gs.* %files hipe %defattr(-,root,root) @@ -1265,9 +1134,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/ic-*/include %{_libdir}/erlang/lib/ic-*/priv %{_libdir}/erlang/lib/ic-*/src -%{_libdir}/erlang/man/man3/ic.* -%{_libdir}/erlang/man/man3/ic_clib.* -%{_libdir}/erlang/man/man3/ic_c_protocol.* %files inets %defattr(-,root,root) @@ -1275,28 +1141,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/inets-*/ebin %{_libdir}/erlang/lib/inets-*/priv %{_libdir}/erlang/lib/inets-*/src -%{_libdir}/erlang/man/man3/ftp.* -%{_libdir}/erlang/man/man3/httpc.* -%{_libdir}/erlang/man/man3/httpd.* -%{_libdir}/erlang/man/man3/httpd_conf.* -%{_libdir}/erlang/man/man3/httpd_socket.* -%{_libdir}/erlang/man/man3/httpd_util.* -%{_libdir}/erlang/man/man3/inets.* -%{_libdir}/erlang/man/man3/mod_alias.* -%{_libdir}/erlang/man/man3/mod_auth.* -%{_libdir}/erlang/man/man3/mod_esi.* -%{_libdir}/erlang/man/man3/mod_security.* -%{_libdir}/erlang/man/man3/tftp.* %files inviso %defattr(-,root,root) %{_libdir}/erlang/lib/inviso-*/ -%{_libdir}/erlang/man/man3/inviso.* -%{_libdir}/erlang/man/man3/inviso_as_lib.* -%{_libdir}/erlang/man/man3/inviso_lfm.* -%{_libdir}/erlang/man/man3/inviso_lfm_tpfreader.* -%{_libdir}/erlang/man/man3/inviso_rt.* -%{_libdir}/erlang/man/man3/inviso_rt_meta.* %files jinterface %defattr(-,root,root) @@ -1308,39 +1156,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/kernel-*/ebin %{_libdir}/erlang/lib/kernel-*/include %{_libdir}/erlang/lib/kernel-*/src -%{_libdir}/erlang/man/man3/application.* -%{_libdir}/erlang/man/man3/auth.* -%{_libdir}/erlang/man/man3/code.* -%{_libdir}/erlang/man/man3/disk_log.* -%{_libdir}/erlang/man/man3/erl_boot_server.* -%{_libdir}/erlang/man/man3/erl_ddll.* -%{_libdir}/erlang/man/man3/erl_prim_loader_stub.* -%{_libdir}/erlang/man/man3/erlang_stub.* -%{_libdir}/erlang/man/man3/error_handler.* -%{_libdir}/erlang/man/man3/error_logger.* -%{_libdir}/erlang/man/man3/file.* -%{_libdir}/erlang/man/man3/gen_sctp.* -%{_libdir}/erlang/man/man3/gen_tcp.* -%{_libdir}/erlang/man/man3/gen_udp.* -%{_libdir}/erlang/man/man3/global.* -%{_libdir}/erlang/man/man3/global_group.* -%{_libdir}/erlang/man/man3/heart.* -%{_libdir}/erlang/man/man3/inet.* -%{_libdir}/erlang/man/man3/inet_res.* -%{_libdir}/erlang/man/man3/init_stub.* -%{_libdir}/erlang/man/man3/net_adm.* -%{_libdir}/erlang/man/man3/net_kernel.* -%{_libdir}/erlang/man/man3/os.* -%{_libdir}/erlang/man/man3/packages.* -%{_libdir}/erlang/man/man3/pg2.* -%{_libdir}/erlang/man/man3/rpc.* -%{_libdir}/erlang/man/man3/seq_trace.* -%{_libdir}/erlang/man/man3/user.* -%{_libdir}/erlang/man/man3/wrap_log_reader.* -%{_libdir}/erlang/man/man3/zlib_stub.* -%{_libdir}/erlang/man/man4/app.* -%{_libdir}/erlang/man/man4/config.* -%{_libdir}/erlang/man/man6/kernel.* %files megaco %defattr(-,root,root) @@ -1349,18 +1164,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/megaco-*/include %{_libdir}/erlang/lib/megaco-*/priv %{_libdir}/erlang/lib/megaco-*/src -%{_libdir}/erlang/man/man3/megaco.* -%{_libdir}/erlang/man/man3/megaco_codec_meas.* -%{_libdir}/erlang/man/man3/megaco_codec_mstone1.* -%{_libdir}/erlang/man/man3/megaco_codec_mstone2.* -%{_libdir}/erlang/man/man3/megaco_codec_transform.* -%{_libdir}/erlang/man/man3/megaco_edist_compress.* -%{_libdir}/erlang/man/man3/megaco_encoder.* -%{_libdir}/erlang/man/man3/megaco_flex_scanner.* -%{_libdir}/erlang/man/man3/megaco_tcp.* -%{_libdir}/erlang/man/man3/megaco_transport.* -%{_libdir}/erlang/man/man3/megaco_udp.* -%{_libdir}/erlang/man/man3/megaco_user.* %files mnesia %defattr(-,root,root) @@ -1368,21 +1171,14 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/mnesia-*/ebin %{_libdir}/erlang/lib/mnesia-*/include %{_libdir}/erlang/lib/mnesia-*/src -%{_libdir}/erlang/man/man3/mnesia.* -%{_libdir}/erlang/man/man3/mnesia_frag_hash.* -%{_libdir}/erlang/man/man3/mnesia_registry.* %files observer %defattr(-,root,root) %{_libdir}/erlang/lib/observer-*/ -%{_libdir}/erlang/man/man3/crashdump.* -%{_libdir}/erlang/man/man3/ttb.* -%{_libdir}/erlang/man/man6/observer.* %files odbc %defattr(-,root,root) %{_libdir}/erlang/lib/odbc-*/ -%{_libdir}/erlang/man/man3/odbc.* %files orber %defattr(-,root,root) @@ -1393,69 +1189,36 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/orber-*/java_src %{_libdir}/erlang/lib/orber-*/priv %{_libdir}/erlang/lib/orber-*/src -%{_libdir}/erlang/man/man3/CosNaming.* -%{_libdir}/erlang/man/man3/CosNaming_BindingIterator.* -%{_libdir}/erlang/man/man3/CosNaming_NamingContext.* -%{_libdir}/erlang/man/man3/CosNaming_NamingContextExt.* -%{_libdir}/erlang/man/man3/Module_Interface.* -%{_libdir}/erlang/man/man3/any.* -%{_libdir}/erlang/man/man3/corba.* -%{_libdir}/erlang/man/man3/corba_object.* -%{_libdir}/erlang/man/man3/etop.* -%{_libdir}/erlang/man/man3/fixed.* -%{_libdir}/erlang/man/man3/interceptors.* -%{_libdir}/erlang/man/man3/lname.* -%{_libdir}/erlang/man/man3/lname_component.* -%{_libdir}/erlang/man/man3/orber.* -%{_libdir}/erlang/man/man3/orber_acl.* -%{_libdir}/erlang/man/man3/orber_diagnostics.* -%{_libdir}/erlang/man/man3/orber_ifr.* -%{_libdir}/erlang/man/man3/orber_tc.* %files os_mon %defattr(-,root,root) %{_libdir}/erlang/lib/os_mon-*/ -%{_libdir}/erlang/man/man3/cpu_sup.* -%{_libdir}/erlang/man/man3/disksup.* -%{_libdir}/erlang/man/man3/memsup.* -%{_libdir}/erlang/man/man3/os_mon_mib.* -%{_libdir}/erlang/man/man3/os_sup.* -%{_libdir}/erlang/man/man6/os_mon.* %files otp_mibs %defattr(-,root,root) %{_libdir}/erlang/lib/otp_mibs-*/ -%{_libdir}/erlang/man/man3/otp_mib.* %files parsetools %defattr(-,root,root) %{_libdir}/erlang/lib/parsetools-*/ -%{_libdir}/erlang/man/man3/leex.* -%{_libdir}/erlang/man/man3/yecc.* %files percept %defattr(-,root,root) %{_libdir}/erlang/lib/percept-*/ -%{_libdir}/erlang/man/man3/egd.* -%{_libdir}/erlang/man/man3/percept.* -%{_libdir}/erlang/man/man3/percept_profile.* %files pman %defattr(-,root,root) %{_libdir}/erlang/lib/pman-*/ -%{_libdir}/erlang/man/man3/pman.* %files public_key %defattr(-,root,root) %{_libdir}/erlang/lib/public_key-*/ -%{_libdir}/erlang/man/man3/public_key.* %files reltool %defattr(-,root,root) %dir %{_libdir}/erlang/lib/reltool-*/ %{_libdir}/erlang/lib/reltool-*/ebin %{_libdir}/erlang/lib/reltool-*/src -%{_libdir}/erlang/man/man3/reltool.* %files rpm-macros %defattr(-,root,root) @@ -1468,23 +1231,10 @@ rm -rf $RPM_BUILD_ROOT %files runtime_tools %defattr(-,root,root) %{_libdir}/erlang/lib/runtime_tools-*/ -%{_libdir}/erlang/man/man3/dbg.* -%{_libdir}/erlang/man/man3/erts_alloc_config.* -%{_libdir}/erlang/man/man6/runtime_tools.* %files sasl %defattr(-,root,root) %{_libdir}/erlang/lib/sasl-*/ -%{_libdir}/erlang/man/man3/alarm_handler.* -%{_libdir}/erlang/man/man3/overload.* -%{_libdir}/erlang/man/man3/rb.* -%{_libdir}/erlang/man/man3/release_handler.* -%{_libdir}/erlang/man/man3/systools.* -%{_libdir}/erlang/man/man4/appup.* -%{_libdir}/erlang/man/man4/rel.* -%{_libdir}/erlang/man/man4/relup.* -%{_libdir}/erlang/man/man4/script.* -%{_libdir}/erlang/man/man6/sasl.* %files snmp %defattr(-,root,root) @@ -1494,62 +1244,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/snmp-*/mibs %{_libdir}/erlang/lib/snmp-*/priv %{_libdir}/erlang/lib/snmp-*/src -%{_libdir}/erlang/man/man3/snmp.* -%{_libdir}/erlang/man/man3/snmpa.* -%{_libdir}/erlang/man/man3/snmpa_conf.* -%{_libdir}/erlang/man/man3/snmpa_discovery_handler.* -%{_libdir}/erlang/man/man3/snmpa_error.* -%{_libdir}/erlang/man/man3/snmpa_error_io.* -%{_libdir}/erlang/man/man3/snmpa_error_logger.* -%{_libdir}/erlang/man/man3/snmpa_error_report.* -%{_libdir}/erlang/man/man3/snmpa_local_db.* -%{_libdir}/erlang/man/man3/snmpa_mpd.* -%{_libdir}/erlang/man/man3/snmpa_network_interface.* -%{_libdir}/erlang/man/man3/snmpa_network_interface_filter.* -%{_libdir}/erlang/man/man3/snmpa_notification_delivery_info_receiver.* -%{_libdir}/erlang/man/man3/snmpa_notification_filter.* -%{_libdir}/erlang/man/man3/snmpa_supervisor.* -%{_libdir}/erlang/man/man3/snmpc.* -%{_libdir}/erlang/man/man3/snmp_community_mib.* -%{_libdir}/erlang/man/man3/snmp_framework_mib.* -%{_libdir}/erlang/man/man3/snmp_generic.* -%{_libdir}/erlang/man/man3/snmp_index.* -%{_libdir}/erlang/man/man3/snmpm.* -%{_libdir}/erlang/man/man3/snmpm_conf.* -%{_libdir}/erlang/man/man3/snmpm_mpd.* -%{_libdir}/erlang/man/man3/snmpm_network_interface.* -%{_libdir}/erlang/man/man3/snmpm_network_interface_filter.* -%{_libdir}/erlang/man/man3/snmpm_user.* -%{_libdir}/erlang/man/man3/snmp_notification_mib.* -%{_libdir}/erlang/man/man3/snmp_pdus.* -%{_libdir}/erlang/man/man3/snmp_standard_mib.* -%{_libdir}/erlang/man/man3/snmp_target_mib.* -%{_libdir}/erlang/man/man3/snmp_user_based_sm_mib.* -%{_libdir}/erlang/man/man3/snmp_view_based_acm_mib.* -%{_libdir}/erlang/man/man6/snmp.* -%{_libdir}/erlang/man/man7/INET-ADDRESS-MIB.* -%{_libdir}/erlang/man/man7/OTP-SNMPEA-MIB.* -%{_libdir}/erlang/man/man7/RFC1213-MIB.* -%{_libdir}/erlang/man/man7/SNMP-COMMUNITY-MIB.* -%{_libdir}/erlang/man/man7/SNMP-FRAMEWORK-MIB.* -%{_libdir}/erlang/man/man7/SNMP-MPD-MIB.* -%{_libdir}/erlang/man/man7/SNMP-NOTIFICATION-MIB.* -%{_libdir}/erlang/man/man7/SNMP-TARGET-MIB.* -%{_libdir}/erlang/man/man7/SNMP-USER-BASED-SM-MIB.* -%{_libdir}/erlang/man/man7/SNMP-USM-AES-MIB.* -%{_libdir}/erlang/man/man7/SNMPv2-MIB.* -%{_libdir}/erlang/man/man7/SNMPv2-TM.* -%{_libdir}/erlang/man/man7/SNMP-VIEW-BASED-ACM-MIB.* -%{_libdir}/erlang/man/man7/STANDARD-MIB.* %files ssh %defattr(-,root,root) %{_libdir}/erlang/lib/ssh-*/ -%{_libdir}/erlang/man/man3/ssh.* -%{_libdir}/erlang/man/man3/ssh_channel.* -%{_libdir}/erlang/man/man3/ssh_connection.* -%{_libdir}/erlang/man/man3/ssh_sftp.* -%{_libdir}/erlang/man/man3/ssh_sftpd.* %files ssl %defattr(-,root,root) @@ -1559,9 +1257,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/ssl-*/pkix %{_libdir}/erlang/lib/ssl-*/priv %{_libdir}/erlang/lib/ssl-*/src -%{_libdir}/erlang/man/man3/new_ssl.* -%{_libdir}/erlang/man/man3/ssl.* -%{_libdir}/erlang/man/man6/ssl.* %files stdlib %defattr(-,root,root) @@ -1569,91 +1264,19 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/stdlib-*/ebin %{_libdir}/erlang/lib/stdlib-*/include %{_libdir}/erlang/lib/stdlib-*/src -%{_libdir}/erlang/man/man3/array.* -%{_libdir}/erlang/man/man3/base64.* -%{_libdir}/erlang/man/man3/beam_lib.* -%{_libdir}/erlang/man/man3/c.* -%{_libdir}/erlang/man/man3/calendar.* -%{_libdir}/erlang/man/man3/dets.* -%{_libdir}/erlang/man/man3/dict.* -%{_libdir}/erlang/man/man3/digraph.* -%{_libdir}/erlang/man/man3/digraph_utils.* -%{_libdir}/erlang/man/man3/epp.* -%{_libdir}/erlang/man/man3/erl_eval.* -%{_libdir}/erlang/man/man3/erl_expand_records.* -%{_libdir}/erlang/man/man3/erl_id_trans.* -%{_libdir}/erlang/man/man3/erl_internal.* -%{_libdir}/erlang/man/man3/erl_lint.* -%{_libdir}/erlang/man/man3/erl_parse.* -%{_libdir}/erlang/man/man3/erl_pp.* -%{_libdir}/erlang/man/man3/erl_scan.* -%{_libdir}/erlang/man/man3/erl_tar.* -%{_libdir}/erlang/man/man3/ets.* -%{_libdir}/erlang/man/man3/file_sorter.* -%{_libdir}/erlang/man/man3/filelib.* -%{_libdir}/erlang/man/man3/filename.* -%{_libdir}/erlang/man/man3/gb_sets.* -%{_libdir}/erlang/man/man3/gb_trees.* -%{_libdir}/erlang/man/man3/gen_event.* -%{_libdir}/erlang/man/man3/gen_fsm.* -%{_libdir}/erlang/man/man3/gen_server.* -%{_libdir}/erlang/man/man3/io.* -%{_libdir}/erlang/man/man3/io_lib.* -%{_libdir}/erlang/man/man3/lib.* -%{_libdir}/erlang/man/man3/lists.* -%{_libdir}/erlang/man/man3/log_mf_h.* -%{_libdir}/erlang/man/man3/math.* -%{_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/random.* -%{_libdir}/erlang/man/man3/re.* -%{_libdir}/erlang/man/man3/regexp.* -%{_libdir}/erlang/man/man3/sets.* -%{_libdir}/erlang/man/man3/shell.* -%{_libdir}/erlang/man/man3/shell_default.* -%{_libdir}/erlang/man/man3/slave.* -%{_libdir}/erlang/man/man3/sofs.* -%{_libdir}/erlang/man/man3/string.* -%{_libdir}/erlang/man/man3/supervisor.* -%{_libdir}/erlang/man/man3/supervisor_bridge.* -%{_libdir}/erlang/man/man3/sys.* -%{_libdir}/erlang/man/man3/timer.* -%{_libdir}/erlang/man/man3/unicode.* -%{_libdir}/erlang/man/man3/zip.* -%{_libdir}/erlang/man/man6/stdlib.* %files syntax_tools %defattr(-,root,root) %dir %{_libdir}/erlang/lib/syntax_tools-*/ %{_libdir}/erlang/lib/syntax_tools-*/ebin -%{_libdir}/erlang/man/man3/epp_dodger.* -%{_libdir}/erlang/man/man3/erl_comment_scan.* -%{_libdir}/erlang/man/man3/erl_prettypr.* -%{_libdir}/erlang/man/man3/erl_recomment.* -%{_libdir}/erlang/man/man3/erl_syntax.* -%{_libdir}/erlang/man/man3/erl_syntax_lib.* -%{_libdir}/erlang/man/man3/erl_tidy.* -%{_libdir}/erlang/man/man3/igor.* -%{_libdir}/erlang/man/man3/prettypr.* %files test_server %defattr(-,root,root) %{_libdir}/erlang/lib/test_server-*/ -%{_libdir}/erlang/man/man3/test_server.* -%{_libdir}/erlang/man/man3/test_server_ctrl.* -%{_libdir}/erlang/man/man6/test_server.* %files toolbar %defattr(-,root,root) %{_libdir}/erlang/lib/toolbar-*/ -%{_libdir}/erlang/man/man3/toolbar.* %files tools %defattr(-,root,root) @@ -1663,21 +1286,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/tools-*/emacs %{_libdir}/erlang/lib/tools-*/priv %{_libdir}/erlang/lib/tools-*/src -%{_libdir}/erlang/man/man3/cover.* -%{_libdir}/erlang/man/man3/cprof.* -%{_libdir}/erlang/man/man3/eprof.* -%{_libdir}/erlang/man/man3/erlang_mode.* -%{_libdir}/erlang/man/man3/fprof.* -%{_libdir}/erlang/man/man3/instrument.* -%{_libdir}/erlang/man/man3/lcnt.* -%{_libdir}/erlang/man/man3/make.* -%{_libdir}/erlang/man/man3/tags.* -%{_libdir}/erlang/man/man3/xref.* %files tv %defattr(-,root,root) %{_libdir}/erlang/lib/tv-*/ -%{_libdir}/erlang/man/man3/tv.* %files typer %defattr(-,root,root) @@ -1686,8 +1298,6 @@ rm -rf $RPM_BUILD_ROOT %files webtool %defattr(-,root,root) %{_libdir}/erlang/lib/webtool-*/ -%{_libdir}/erlang/man/man1/start_webtool.* -%{_libdir}/erlang/man/man3/webtool.* %files wx %defattr(-,root,root) @@ -1696,232 +1306,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/wx-*/include %{_libdir}/erlang/lib/wx-*/priv %{_libdir}/erlang/lib/wx-*/src -%{_libdir}/erlang/man/man3/gl.* -%{_libdir}/erlang/man/man3/glu.* -%{_libdir}/erlang/man/man3/wx.* -%{_libdir}/erlang/man/man3/wx_misc.* -%{_libdir}/erlang/man/man3/wx_object.* -%{_libdir}/erlang/man/man3/wxAcceleratorEntry.* -%{_libdir}/erlang/man/man3/wxAcceleratorTable.* -%{_libdir}/erlang/man/man3/wxArtProvider.* -%{_libdir}/erlang/man/man3/wxAuiDockArt.* -%{_libdir}/erlang/man/man3/wxAuiManager.* -%{_libdir}/erlang/man/man3/wxAuiManagerEvent.* -%{_libdir}/erlang/man/man3/wxAuiNotebook.* -%{_libdir}/erlang/man/man3/wxAuiNotebookEvent.* -%{_libdir}/erlang/man/man3/wxAuiPaneInfo.* -%{_libdir}/erlang/man/man3/wxAuiTabArt.* -%{_libdir}/erlang/man/man3/wxBitmap.* -%{_libdir}/erlang/man/man3/wxBitmapButton.* -%{_libdir}/erlang/man/man3/wxBitmapDataObject.* -%{_libdir}/erlang/man/man3/wxBoxSizer.* -%{_libdir}/erlang/man/man3/wxBrush.* -%{_libdir}/erlang/man/man3/wxBufferedDC.* -%{_libdir}/erlang/man/man3/wxBufferedPaintDC.* -%{_libdir}/erlang/man/man3/wxButton.* -%{_libdir}/erlang/man/man3/wxCalendarCtrl.* -%{_libdir}/erlang/man/man3/wxCalendarDateAttr.* -%{_libdir}/erlang/man/man3/wxCalendarEvent.* -%{_libdir}/erlang/man/man3/wxCaret.* -%{_libdir}/erlang/man/man3/wxCheckBox.* -%{_libdir}/erlang/man/man3/wxCheckListBox.* -%{_libdir}/erlang/man/man3/wxChildFocusEvent.* -%{_libdir}/erlang/man/man3/wxChoice.* -%{_libdir}/erlang/man/man3/wxChoicebook.* -%{_libdir}/erlang/man/man3/wxClientDC.* -%{_libdir}/erlang/man/man3/wxClipboard.* -%{_libdir}/erlang/man/man3/wxCloseEvent.* -%{_libdir}/erlang/man/man3/wxColourData.* -%{_libdir}/erlang/man/man3/wxColourDialog.* -%{_libdir}/erlang/man/man3/wxColourPickerCtrl.* -%{_libdir}/erlang/man/man3/wxColourPickerEvent.* -%{_libdir}/erlang/man/man3/wxComboBox.* -%{_libdir}/erlang/man/man3/wxCommandEvent.* -%{_libdir}/erlang/man/man3/wxContextMenuEvent.* -%{_libdir}/erlang/man/man3/wxControl.* -%{_libdir}/erlang/man/man3/wxControlWithItems.* -%{_libdir}/erlang/man/man3/wxCursor.* -%{_libdir}/erlang/man/man3/wxDataObject.* -%{_libdir}/erlang/man/man3/wxDateEvent.* -%{_libdir}/erlang/man/man3/wxDatePickerCtrl.* -%{_libdir}/erlang/man/man3/wxDC.* -%{_libdir}/erlang/man/man3/wxDialog.* -%{_libdir}/erlang/man/man3/wxDirDialog.* -%{_libdir}/erlang/man/man3/wxDirPickerCtrl.* -%{_libdir}/erlang/man/man3/wxDisplayChangedEvent.* -%{_libdir}/erlang/man/man3/wxEraseEvent.* -%{_libdir}/erlang/man/man3/wxEvent.* -%{_libdir}/erlang/man/man3/wxEvtHandler.* -%{_libdir}/erlang/man/man3/wxFileDataObject.* -%{_libdir}/erlang/man/man3/wxFileDialog.* -%{_libdir}/erlang/man/man3/wxFileDirPickerEvent.* -%{_libdir}/erlang/man/man3/wxFilePickerCtrl.* -%{_libdir}/erlang/man/man3/wxFindReplaceData.* -%{_libdir}/erlang/man/man3/wxFindReplaceDialog.* -%{_libdir}/erlang/man/man3/wxFlexGridSizer.* -%{_libdir}/erlang/man/man3/wxFocusEvent.* -%{_libdir}/erlang/man/man3/wxFont.* -%{_libdir}/erlang/man/man3/wxFontData.* -%{_libdir}/erlang/man/man3/wxFontDialog.* -%{_libdir}/erlang/man/man3/wxFontPickerCtrl.* -%{_libdir}/erlang/man/man3/wxFontPickerEvent.* -%{_libdir}/erlang/man/man3/wxFrame.* -%{_libdir}/erlang/man/man3/wxGauge.* -%{_libdir}/erlang/man/man3/wxGBSizerItem.* -%{_libdir}/erlang/man/man3/wxGenericDirCtrl.* -%{_libdir}/erlang/man/man3/wxGLCanvas.* -%{_libdir}/erlang/man/man3/wxGraphicsBrush.* -%{_libdir}/erlang/man/man3/wxGraphicsContext.* -%{_libdir}/erlang/man/man3/wxGraphicsFont.* -%{_libdir}/erlang/man/man3/wxGraphicsMatrix.* -%{_libdir}/erlang/man/man3/wxGraphicsObject.* -%{_libdir}/erlang/man/man3/wxGraphicsPath.* -%{_libdir}/erlang/man/man3/wxGraphicsPen.* -%{_libdir}/erlang/man/man3/wxGraphicsRenderer.* -%{_libdir}/erlang/man/man3/wxGrid.* -%{_libdir}/erlang/man/man3/wxGridBagSizer.* -%{_libdir}/erlang/man/man3/wxGridCellAttr.* -%{_libdir}/erlang/man/man3/wxGridCellBoolEditor.* -%{_libdir}/erlang/man/man3/wxGridCellBoolRenderer.* -%{_libdir}/erlang/man/man3/wxGridCellChoiceEditor.* -%{_libdir}/erlang/man/man3/wxGridCellEditor.* -%{_libdir}/erlang/man/man3/wxGridCellFloatEditor.* -%{_libdir}/erlang/man/man3/wxGridCellFloatRenderer.* -%{_libdir}/erlang/man/man3/wxGridCellNumberEditor.* -%{_libdir}/erlang/man/man3/wxGridCellNumberRenderer.* -%{_libdir}/erlang/man/man3/wxGridCellRenderer.* -%{_libdir}/erlang/man/man3/wxGridCellStringRenderer.* -%{_libdir}/erlang/man/man3/wxGridCellTextEditor.* -%{_libdir}/erlang/man/man3/wxGridEvent.* -%{_libdir}/erlang/man/man3/wxGridSizer.* -%{_libdir}/erlang/man/man3/wxHelpEvent.* -%{_libdir}/erlang/man/man3/wxHtmlEasyPrinting.* -%{_libdir}/erlang/man/man3/wxHtmlLinkEvent.* -%{_libdir}/erlang/man/man3/wxHtmlWindow.* -%{_libdir}/erlang/man/man3/wxIcon.* -%{_libdir}/erlang/man/man3/wxIconBundle.* -%{_libdir}/erlang/man/man3/wxIconizeEvent.* -%{_libdir}/erlang/man/man3/wxIdleEvent.* -%{_libdir}/erlang/man/man3/wxImage.* -%{_libdir}/erlang/man/man3/wxImageList.* -%{_libdir}/erlang/man/man3/wxJoystickEvent.* -%{_libdir}/erlang/man/man3/wxKeyEvent.* -%{_libdir}/erlang/man/man3/wxLayoutAlgorithm.* -%{_libdir}/erlang/man/man3/wxListbook.* -%{_libdir}/erlang/man/man3/wxListBox.* -%{_libdir}/erlang/man/man3/wxListCtrl.* -%{_libdir}/erlang/man/man3/wxListEvent.* -%{_libdir}/erlang/man/man3/wxListItem.* -%{_libdir}/erlang/man/man3/wxListView.* -%{_libdir}/erlang/man/man3/wxLogNull.* -%{_libdir}/erlang/man/man3/wxMask.* -%{_libdir}/erlang/man/man3/wxMaximizeEvent.* -%{_libdir}/erlang/man/man3/wxMDIChildFrame.* -%{_libdir}/erlang/man/man3/wxMDIClientWindow.* -%{_libdir}/erlang/man/man3/wxMDIParentFrame.* -%{_libdir}/erlang/man/man3/wxMemoryDC.* -%{_libdir}/erlang/man/man3/wxMenu.* -%{_libdir}/erlang/man/man3/wxMenuBar.* -%{_libdir}/erlang/man/man3/wxMenuEvent.* -%{_libdir}/erlang/man/man3/wxMenuItem.* -%{_libdir}/erlang/man/man3/wxMessageDialog.* -%{_libdir}/erlang/man/man3/wxMiniFrame.* -%{_libdir}/erlang/man/man3/wxMirrorDC.* -%{_libdir}/erlang/man/man3/wxMouseCaptureChangedEvent.* -%{_libdir}/erlang/man/man3/wxMouseEvent.* -%{_libdir}/erlang/man/man3/wxMoveEvent.* -%{_libdir}/erlang/man/man3/wxMultiChoiceDialog.* -%{_libdir}/erlang/man/man3/wxNavigationKeyEvent.* -%{_libdir}/erlang/man/man3/wxNcPaintEvent.* -%{_libdir}/erlang/man/man3/wxNotebook.* -%{_libdir}/erlang/man/man3/wxNotebookEvent.* -%{_libdir}/erlang/man/man3/wxNotifyEvent.* -%{_libdir}/erlang/man/man3/wxPageSetupDialog.* -%{_libdir}/erlang/man/man3/wxPageSetupDialogData.* -%{_libdir}/erlang/man/man3/wxPaintDC.* -%{_libdir}/erlang/man/man3/wxPaintEvent.* -%{_libdir}/erlang/man/man3/wxPalette.* -%{_libdir}/erlang/man/man3/wxPaletteChangedEvent.* -%{_libdir}/erlang/man/man3/wxPanel.* -%{_libdir}/erlang/man/man3/wxPasswordEntryDialog.* -%{_libdir}/erlang/man/man3/wxPen.* -%{_libdir}/erlang/man/man3/wxPickerBase.* -%{_libdir}/erlang/man/man3/wxPostScriptDC.* -%{_libdir}/erlang/man/man3/wxPreviewCanvas.* -%{_libdir}/erlang/man/man3/wxPreviewControlBar.* -%{_libdir}/erlang/man/man3/wxPreviewFrame.* -%{_libdir}/erlang/man/man3/wxPrintData.* -%{_libdir}/erlang/man/man3/wxPrintDialog.* -%{_libdir}/erlang/man/man3/wxPrintDialogData.* -%{_libdir}/erlang/man/man3/wxPrinter.* -%{_libdir}/erlang/man/man3/wxPrintout.* -%{_libdir}/erlang/man/man3/wxPrintPreview.* -%{_libdir}/erlang/man/man3/wxProgressDialog.* -%{_libdir}/erlang/man/man3/wxQueryNewPaletteEvent.* -%{_libdir}/erlang/man/man3/wxRadioBox.* -%{_libdir}/erlang/man/man3/wxRadioButton.* -%{_libdir}/erlang/man/man3/wxRegion.* -%{_libdir}/erlang/man/man3/wxSashEvent.* -%{_libdir}/erlang/man/man3/wxSashLayoutWindow.* -%{_libdir}/erlang/man/man3/wxSashWindow.* -%{_libdir}/erlang/man/man3/wxScreenDC.* -%{_libdir}/erlang/man/man3/wxScrollBar.* -%{_libdir}/erlang/man/man3/wxScrolledWindow.* -%{_libdir}/erlang/man/man3/wxScrollEvent.* -%{_libdir}/erlang/man/man3/wxScrollWinEvent.* -%{_libdir}/erlang/man/man3/wxSetCursorEvent.* -%{_libdir}/erlang/man/man3/wxShowEvent.* -%{_libdir}/erlang/man/man3/wxSingleChoiceDialog.* -%{_libdir}/erlang/man/man3/wxSizeEvent.* -%{_libdir}/erlang/man/man3/wxSizer.* -%{_libdir}/erlang/man/man3/wxSizerFlags.* -%{_libdir}/erlang/man/man3/wxSizerItem.* -%{_libdir}/erlang/man/man3/wxSlider.* -%{_libdir}/erlang/man/man3/wxSpinButton.* -%{_libdir}/erlang/man/man3/wxSpinCtrl.* -%{_libdir}/erlang/man/man3/wxSpinEvent.* -%{_libdir}/erlang/man/man3/wxSplashScreen.* -%{_libdir}/erlang/man/man3/wxSplitterEvent.* -%{_libdir}/erlang/man/man3/wxSplitterWindow.* -%{_libdir}/erlang/man/man3/wxStaticBitmap.* -%{_libdir}/erlang/man/man3/wxStaticBox.* -%{_libdir}/erlang/man/man3/wxStaticBoxSizer.* -%{_libdir}/erlang/man/man3/wxStaticLine.* -%{_libdir}/erlang/man/man3/wxStaticText.* -%{_libdir}/erlang/man/man3/wxStatusBar.* -%{_libdir}/erlang/man/man3/wxStdDialogButtonSizer.* -%{_libdir}/erlang/man/man3/wxStyledTextCtrl.* -%{_libdir}/erlang/man/man3/wxStyledTextEvent.* -%{_libdir}/erlang/man/man3/wxSysColourChangedEvent.* -%{_libdir}/erlang/man/man3/wxTextAttr.* -%{_libdir}/erlang/man/man3/wxTextCtrl.* -%{_libdir}/erlang/man/man3/wxTextDataObject.* -%{_libdir}/erlang/man/man3/wxTextEntryDialog.* -%{_libdir}/erlang/man/man3/wxToggleButton.* -%{_libdir}/erlang/man/man3/wxToolBar.* -%{_libdir}/erlang/man/man3/wxToolbook.* -%{_libdir}/erlang/man/man3/wxToolTip.* -%{_libdir}/erlang/man/man3/wxTopLevelWindow.* -%{_libdir}/erlang/man/man3/wxTreebook.* -%{_libdir}/erlang/man/man3/wxTreeCtrl.* -%{_libdir}/erlang/man/man3/wxTreeEvent.* -%{_libdir}/erlang/man/man3/wxUpdateUIEvent.* -%{_libdir}/erlang/man/man3/wxWindow.* -%{_libdir}/erlang/man/man3/wxWindowCreateEvent.* -%{_libdir}/erlang/man/man3/wxWindowDC.* -%{_libdir}/erlang/man/man3/wxWindowDestroyEvent.* -%{_libdir}/erlang/man/man3/wxXmlResource.* %files xmerl %defattr(-,root,root) %{_libdir}/erlang/lib/xmerl-*/ -%{_libdir}/erlang/man/man3/xmerl.* -%{_libdir}/erlang/man/man3/xmerl_eventp.* -%{_libdir}/erlang/man/man3/xmerl_sax_parser.* -%{_libdir}/erlang/man/man3/xmerl_scan.* -%{_libdir}/erlang/man/man3/xmerl_xpath.* -%{_libdir}/erlang/man/man3/xmerl_xs.* -%{_libdir}/erlang/man/man3/xmerl_xsd.* %changelog -- cgit From cf3d7ba686aed35c3be065001274e8d3ce29fa70 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 14 May 2010 14:41:49 +0000 Subject: bootstrap erlang (last minute fix) --- erlang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index cdb842a..af86e44 100644 --- a/erlang.spec +++ b/erlang.spec @@ -891,7 +891,7 @@ chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/Makefile chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/src/Makefile # Relocate doc-files into the proper directory -#mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib +mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} #pushd . #cd $RPM_BUILD_ROOT%{_libdir}/erlang #mv -v doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} -- cgit From 349e0b964b0ef52a8654ce8fd8bf5d21d861449d Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 14 May 2010 14:43:32 +0000 Subject: bootstrap erlang (forgot to bump release during prevoius commit) --- erlang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index af86e44..0c8ed60 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.11%{?dist}.1 +Release: %{rel}.11%{?dist}.2 Summary: General-purpose programming language and runtime environment Group: Development/Languages -- cgit From 3525d9dbb805d6b3cae295a5c77b295e8aa9abe3 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 15 May 2010 03:00:58 +0000 Subject: erlang bootstrap (3rd attempt - with all issues fixed) --- erlang.spec | 20 +++++++------------- import.log | 1 + 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/erlang.spec b/erlang.spec index 0c8ed60..1ee7b81 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.11%{?dist}.2 +Release: %{rel}.11%{?dist}.3 Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -900,9 +900,9 @@ mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} #for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib/$i || true ; done #popd cp -av AUTHORS EPLICENCE README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} -mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} -mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} -mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +#mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +#mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +#mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} # Win32-specific functionality rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/observer-*/priv/bin/etop.bat @@ -972,10 +972,10 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %dir %{_docdir}/%{name}-%{ver}-%{rel}/ %doc %{_docdir}/%{name}-%{ver}-%{rel}/AUTHORS -%doc %{_docdir}/%{name}-%{ver}-%{rel}/COPYRIGHT +#%doc %{_docdir}/%{name}-%{ver}-%{rel}/COPYRIGHT %doc %{_docdir}/%{name}-%{ver}-%{rel}/EPLICENCE -%doc %{_docdir}/%{name}-%{ver}-%{rel}/PR.template -%doc %{_docdir}/%{name}-%{ver}-%{rel}/README +#%doc %{_docdir}/%{name}-%{ver}-%{rel}/PR.template +#%doc %{_docdir}/%{name}-%{ver}-%{rel}/README %doc %{_docdir}/%{name}-%{ver}-%{rel}/README.md %files appmon @@ -1067,12 +1067,6 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/erlang/ %dir %{_libdir}/erlang/bin/ %dir %{_libdir}/erlang/lib/ -%dir %{_libdir}/erlang/man/ -%dir %{_libdir}/erlang/man/man1/ -%dir %{_libdir}/erlang/man/man3/ -%dir %{_libdir}/erlang/man/man4/ -%dir %{_libdir}/erlang/man/man6/ -%dir %{_libdir}/erlang/man/man7/ %dir %{_libdir}/erlang/releases/ %{_bindir}/* diff --git a/import.log b/import.log index ff28804..834a79d 100644 --- a/import.log +++ b/import.log @@ -6,3 +6,4 @@ erlang-R13B-04_5_fc12:F-12:erlang-R13B-04.5.fc12.src.rpm:1272271343 erlang-R13B-04_6_fc12:F-12:erlang-R13B-04.6.fc12.src.rpm:1272303739 erlang-R13B-04_9_fc12:F-12:erlang-R13B-04.9.fc12.src.rpm:1272528494 erlang-R13B-04_11_fc12:EL-6:erlang-R13B-04.11.fc12.src.rpm:1273841835 +erlang-R13B-04_11_fc12_3:EL-6:erlang-R13B-04.11.fc12.3.src.rpm:1273892386 -- cgit From 5804dc4b4023a135892022500c3df7aa05e15ef0 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 15 May 2010 05:26:47 +0000 Subject: Relocated dialyzer and typer binaries --- erlang.spec | 712 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- import.log | 1 + 2 files changed, 689 insertions(+), 24 deletions(-) diff --git a/erlang.spec b/erlang.spec index 1ee7b81..a29647a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.11%{?dist}.3 +Release: %{rel}.12%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -39,7 +39,7 @@ BuildRequires: m4 BuildRequires: fop BuildRequires: libxslt # Required for building docs (escript) -#BuildRequires: erlang +BuildRequires: erlang Requires: erlang-appmon = %{version}-%{release} Requires: erlang-asn1 = %{version}-%{release} @@ -873,13 +873,13 @@ CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enabl CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib %endif make -#make docs +make docs %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -#make DESTDIR=$RPM_BUILD_ROOT install-docs +make DESTDIR=$RPM_BUILD_ROOT install-docs # fix 0775 permission on some directories find $RPM_BUILD_ROOT%{_libdir}/erlang -type d -perm 0775 | xargs chmod 755 @@ -891,18 +891,18 @@ chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/Makefile chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/src/Makefile # Relocate doc-files into the proper directory -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} -#pushd . -#cd $RPM_BUILD_ROOT%{_libdir}/erlang -#mv -v doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} -#for i in erts-* ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/$i ; done -#cd $RPM_BUILD_ROOT%{_libdir}/erlang/lib -#for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib/$i || true ; done -#popd +mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib +pushd . +cd $RPM_BUILD_ROOT%{_libdir}/erlang +mv -v doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +for i in erts-* ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/$i ; done +cd $RPM_BUILD_ROOT%{_libdir}/erlang/lib +for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib/$i || true ; done +popd cp -av AUTHORS EPLICENCE README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} -#mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} -#mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} -#mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} # Win32-specific functionality rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/observer-*/priv/bin/etop.bat @@ -943,6 +943,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/tools-*/c_src rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/man # remove unneeded files +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/info rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/*-*/info rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/hipe-*/vsn.mk @@ -972,15 +973,16 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %dir %{_docdir}/%{name}-%{ver}-%{rel}/ %doc %{_docdir}/%{name}-%{ver}-%{rel}/AUTHORS -#%doc %{_docdir}/%{name}-%{ver}-%{rel}/COPYRIGHT +%doc %{_docdir}/%{name}-%{ver}-%{rel}/COPYRIGHT %doc %{_docdir}/%{name}-%{ver}-%{rel}/EPLICENCE -#%doc %{_docdir}/%{name}-%{ver}-%{rel}/PR.template -#%doc %{_docdir}/%{name}-%{ver}-%{rel}/README +%doc %{_docdir}/%{name}-%{ver}-%{rel}/PR.template +%doc %{_docdir}/%{name}-%{ver}-%{rel}/README %doc %{_docdir}/%{name}-%{ver}-%{rel}/README.md %files appmon %defattr(-,root,root) %{_libdir}/erlang/lib/appmon-*/ +%{_libdir}/erlang/man/man3/appmon.* %files asn1 %defattr(-,root,root) @@ -988,69 +990,170 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/asn1-*/ebin %{_libdir}/erlang/lib/asn1-*/priv %{_libdir}/erlang/lib/asn1-*/src +%{_libdir}/erlang/man/man3/asn1ct.* +%{_libdir}/erlang/man/man3/asn1rt.* %files common_test %defattr(-,root,root) %{_libdir}/erlang/lib/common_test-*/ +%{_libdir}/erlang/man/man1/run_test.* +%{_libdir}/erlang/man/man3/ct.* +%{_libdir}/erlang/man/man3/ct_cover.* +%{_libdir}/erlang/man/man3/ct_ftp.* +%{_libdir}/erlang/man/man3/ct_master.* +%{_libdir}/erlang/man/man3/ct_rpc.* +%{_libdir}/erlang/man/man3/ct_snmp.* +%{_libdir}/erlang/man/man3/ct_ssh.* +%{_libdir}/erlang/man/man3/ct_telnet.* +%{_libdir}/erlang/man/man3/unix_telnet.* +%{_libdir}/erlang/man/man6/common_test.* %files compiler %defattr(-,root,root) %{_libdir}/erlang/lib/compiler-*/ +%{_libdir}/erlang/man/man3/compile.* %files cosEvent %defattr(-,root,root) %{_libdir}/erlang/lib/cosEvent-*/ +%{_libdir}/erlang/man/man3/cosEventApp.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ConsumerAdmin.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_EventChannel.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPullConsumer.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPullSupplier.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPushConsumer.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPushSupplier.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_SupplierAdmin.* %files cosEventDomain %defattr(-,root,root) %{_libdir}/erlang/lib/cosEventDomain-*/ +%{_libdir}/erlang/man/man3/CosEventDomainAdmin.* +%{_libdir}/erlang/man/man3/CosEventDomainAdmin_EventDomain.* +%{_libdir}/erlang/man/man3/CosEventDomainAdmin_EventDomainFactory.* +%{_libdir}/erlang/man/man3/cosEventDomainApp.* %files cosFileTransfer %defattr(-,root,root) %{_libdir}/erlang/lib/cosFileTransfer-*/ +%{_libdir}/erlang/man/man3/cosFileTransferApp.* +%{_libdir}/erlang/man/man3/CosFileTransfer_Directory.* +%{_libdir}/erlang/man/man3/CosFileTransfer_File.* +%{_libdir}/erlang/man/man3/CosFileTransfer_FileIterator.* +%{_libdir}/erlang/man/man3/CosFileTransfer_FileTransferSession.* +%{_libdir}/erlang/man/man3/CosFileTransfer_VirtualFileSystem.* %files cosNotification %defattr(-,root,root) %{_libdir}/erlang/lib/cosNotification-*/ +%{_libdir}/erlang/man/man3/CosNotification.* +%{_libdir}/erlang/man/man3/CosNotification_AdminPropertiesAdmin.* +%{_libdir}/erlang/man/man3/cosNotificationApp.* +%{_libdir}/erlang/man/man3/CosNotification_QoSAdmin.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ConsumerAdmin.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_EventChannel.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_EventChannelFactory.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPullConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPullSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPushConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPushSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxySupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPullConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPullSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPushConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPushSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPullConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPullSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPushConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPushSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SupplierAdmin.* +%{_libdir}/erlang/man/man3/CosNotifyComm_NotifyPublish.* +%{_libdir}/erlang/man/man3/CosNotifyComm_NotifySubscribe.* +%{_libdir}/erlang/man/man3/CosNotifyFilter_Filter.* +%{_libdir}/erlang/man/man3/CosNotifyFilter_FilterAdmin.* +%{_libdir}/erlang/man/man3/CosNotifyFilter_FilterFactory.* +%{_libdir}/erlang/man/man3/CosNotifyFilter_MappingFilter.* %files cosProperty %defattr(-,root,root) %{_libdir}/erlang/lib/cosProperty-*/ +%{_libdir}/erlang/man/man3/cosProperty.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertiesIterator.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertyNamesIterator.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertySet.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetDef.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetDefFactory.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetFactory.* %files cosTime %defattr(-,root,root) %{_libdir}/erlang/lib/cosTime-*/ +%{_libdir}/erlang/man/man3/cosTime.* +%{_libdir}/erlang/man/man3/CosTimerEvent_TimerEventHandler.* +%{_libdir}/erlang/man/man3/CosTimerEvent_TimerEventService.* +%{_libdir}/erlang/man/man3/CosTime_TimeService.* +%{_libdir}/erlang/man/man3/CosTime_TIO.* +%{_libdir}/erlang/man/man3/CosTime_UTO.* %files cosTransactions %defattr(-,root,root) %{_libdir}/erlang/lib/cosTransactions-*/ +%{_libdir}/erlang/man/man3/cosTransactions.* +%{_libdir}/erlang/man/man3/CosTransactions_Control.* +%{_libdir}/erlang/man/man3/CosTransactions_Coordinator.* +%{_libdir}/erlang/man/man3/CosTransactions_RecoveryCoordinator.* +%{_libdir}/erlang/man/man3/CosTransactions_Resource.* +%{_libdir}/erlang/man/man3/CosTransactions_SubtransactionAwareResource.* +%{_libdir}/erlang/man/man3/CosTransactions_Terminator.* +%{_libdir}/erlang/man/man3/CosTransactions_TransactionFactory.* %files crypto %defattr(-,root,root) %{_libdir}/erlang/lib/crypto-*/ +%{_libdir}/erlang/man/man3/crypto.* +%{_libdir}/erlang/man/man6/crypto.* %files debugger %defattr(-,root,root) %{_libdir}/erlang/lib/debugger-*/ +%{_libdir}/erlang/man/man3/debugger.* +%{_libdir}/erlang/man/man3/i.* +%{_libdir}/erlang/man/man3/int.* %files dialyzer %defattr(-,root,root) +%{_bindir}/dialyzer +%{_libdir}/erlang/bin/dialyzer +%{_libdir}/erlang/erts-*/bin/dialyzer %{_libdir}/erlang/lib/dialyzer-*/ +%{_libdir}/erlang/man/man3/dialyzer.* %files doc %defattr(-,root,root) -#doc %{_docdir}/%{name}-%{ver}-%{rel}/doc -#doc %{_docdir}/%{name}-%{ver}-%{rel}/erts-*/ -#doc %{_docdir}/%{name}-%{ver}-%{rel}/lib/ +%doc %{_docdir}/%{name}-%{ver}-%{rel}/doc +%doc %{_docdir}/%{name}-%{ver}-%{rel}/erts-*/ +%doc %{_docdir}/%{name}-%{ver}-%{rel}/lib/ %files docbuilder %defattr(-,root,root) %{_libdir}/erlang/lib/docbuilder-*/ +%{_libdir}/erlang/man/man3/docb_gen.* +%{_libdir}/erlang/man/man3/docb_transform.* +%{_libdir}/erlang/man/man3/docb_xml_check.* +%{_libdir}/erlang/man/man6/docbuilder.* %files edoc %defattr(-,root,root) %{_libdir}/erlang/lib/edoc-*/ +%{_libdir}/erlang/man/man3/edoc.* +%{_libdir}/erlang/man/man3/edoc_doclet.* +%{_libdir}/erlang/man/man3/edoc_extract.* +%{_libdir}/erlang/man/man3/edoc_layout.* +%{_libdir}/erlang/man/man3/edoc_lib.* +%{_libdir}/erlang/man/man3/edoc_run.* %files erl_docgen %defattr(-,root,root) @@ -1059,6 +1162,17 @@ rm -rf $RPM_BUILD_ROOT %files erl_interface %defattr(-,root,root) %{_libdir}/erlang/lib/erl_interface-*/ +%{_libdir}/erlang/man/man1/erl_call.* +%{_libdir}/erlang/man/man3/ei.* +%{_libdir}/erlang/man/man3/ei_connect.* +%{_libdir}/erlang/man/man3/erl_connect.* +%{_libdir}/erlang/man/man3/erl_error.* +%{_libdir}/erlang/man/man3/erl_eterm.* +%{_libdir}/erlang/man/man3/erl_format.* +%{_libdir}/erlang/man/man3/erl_global.* +%{_libdir}/erlang/man/man3/erl_malloc.* +%{_libdir}/erlang/man/man3/erl_marshal.* +%{_libdir}/erlang/man/man3/registry.* %files erts %defattr(-,root,root) @@ -1067,12 +1181,68 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/erlang/ %dir %{_libdir}/erlang/bin/ %dir %{_libdir}/erlang/lib/ +%dir %{_libdir}/erlang/man/ +%dir %{_libdir}/erlang/man/man1/ +%dir %{_libdir}/erlang/man/man3/ +%dir %{_libdir}/erlang/man/man4/ +%dir %{_libdir}/erlang/man/man6/ +%dir %{_libdir}/erlang/man/man7/ %dir %{_libdir}/erlang/releases/ -%{_bindir}/* -%{_libdir}/erlang/bin/* -%{_libdir}/erlang/erts-*/ +%{_bindir}/epmd +%{_bindir}/erl +%{_bindir}/erlc +%{_bindir}/escript +%{_bindir}/run_erl +%{_bindir}/to_erl +%{_libdir}/erlang/bin/epmd +%{_libdir}/erlang/bin/erl +%{_libdir}/erlang/bin/erlc +%{_libdir}/erlang/bin/escript +%{_libdir}/erlang/bin/run_erl +%{_libdir}/erlang/bin/start +%{_libdir}/erlang/bin/start.boot +%{_libdir}/erlang/bin/start.script +%{_libdir}/erlang/bin/start_clean.boot +%{_libdir}/erlang/bin/start_erl +%{_libdir}/erlang/bin/start_sasl.boot +%{_libdir}/erlang/bin/to_erl +%dir %{_libdir}/erlang/erts-*/bin +%{_libdir}/erlang/erts-*/bin/beam +%{_libdir}/erlang/erts-*/bin/beam.smp +%{_libdir}/erlang/erts-*/bin/child_setup +%{_libdir}/erlang/erts-*/bin/dyn_erl +%{_libdir}/erlang/erts-*/bin/epmd +%{_libdir}/erlang/erts-*/bin/erl +%{_libdir}/erlang/erts-*/bin/erl.src +%{_libdir}/erlang/erts-*/bin/erlc +%{_libdir}/erlang/erts-*/bin/erlexec +%{_libdir}/erlang/erts-*/bin/escript +%{_libdir}/erlang/erts-*/bin/heart +%{_libdir}/erlang/erts-*/bin/inet_gethost +%{_libdir}/erlang/erts-*/bin/run_erl +%{_libdir}/erlang/erts-*/bin/start +%{_libdir}/erlang/erts-*/bin/start.src +%{_libdir}/erlang/erts-*/bin/start_erl.src +%{_libdir}/erlang/erts-*/bin/to_erl +%{_libdir}/erlang/erts-*/include +%{_libdir}/erlang/erts-*/lib +%{_libdir}/erlang/erts-*/src %{_libdir}/erlang/lib/erts-*/ +%{_libdir}/erlang/man/man1/epmd.* +%{_libdir}/erlang/man/man1/erl.* +%{_libdir}/erlang/man/man1/erlc.* +%{_libdir}/erlang/man/man1/escript.* +%{_libdir}/erlang/man/man1/run_erl.* +%{_libdir}/erlang/man/man1/start.* +%{_libdir}/erlang/man/man1/start_erl.* +%{_libdir}/erlang/man/man3/driver_entry.* +%{_libdir}/erlang/man/man3/erl_driver.* +%{_libdir}/erlang/man/man3/erl_prim_loader.* +%{_libdir}/erlang/man/man3/erlang.* +%{_libdir}/erlang/man/man3/erts_alloc.* +%{_libdir}/erlang/man/man3/init.* +%{_libdir}/erlang/man/man3/zlib.* %{_libdir}/erlang/releases/* %{_libdir}/erlang/usr/ @@ -1082,12 +1252,18 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/et-*/ebin %{_libdir}/erlang/lib/et-*/include %{_libdir}/erlang/lib/et-*/src +%{_libdir}/erlang/man/man3/et.* +%{_libdir}/erlang/man/man3/et_collector.* +%{_libdir}/erlang/man/man3/et_selector.* +%{_libdir}/erlang/man/man3/et_viewer.* %files eunit %defattr(-,root,root) %dir %{_libdir}/erlang/lib/eunit-*/ %{_libdir}/erlang/lib/eunit-*/ebin %{_libdir}/erlang/lib/eunit-*/include +%{_libdir}/erlang/man/man3/eunit.* +%{_libdir}/erlang/man/man3/eunit_surefire.* %files examples %defattr(-,root,root) @@ -1116,6 +1292,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/gs-*/ebin %{_libdir}/erlang/lib/gs-*/priv %{_libdir}/erlang/lib/gs-*/src +%{_libdir}/erlang/man/man3/gs.* %files hipe %defattr(-,root,root) @@ -1128,6 +1305,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/ic-*/include %{_libdir}/erlang/lib/ic-*/priv %{_libdir}/erlang/lib/ic-*/src +%{_libdir}/erlang/man/man3/ic.* +%{_libdir}/erlang/man/man3/ic_clib.* +%{_libdir}/erlang/man/man3/ic_c_protocol.* %files inets %defattr(-,root,root) @@ -1135,10 +1315,28 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/inets-*/ebin %{_libdir}/erlang/lib/inets-*/priv %{_libdir}/erlang/lib/inets-*/src +%{_libdir}/erlang/man/man3/ftp.* +%{_libdir}/erlang/man/man3/httpc.* +%{_libdir}/erlang/man/man3/httpd.* +%{_libdir}/erlang/man/man3/httpd_conf.* +%{_libdir}/erlang/man/man3/httpd_socket.* +%{_libdir}/erlang/man/man3/httpd_util.* +%{_libdir}/erlang/man/man3/inets.* +%{_libdir}/erlang/man/man3/mod_alias.* +%{_libdir}/erlang/man/man3/mod_auth.* +%{_libdir}/erlang/man/man3/mod_esi.* +%{_libdir}/erlang/man/man3/mod_security.* +%{_libdir}/erlang/man/man3/tftp.* %files inviso %defattr(-,root,root) %{_libdir}/erlang/lib/inviso-*/ +%{_libdir}/erlang/man/man3/inviso.* +%{_libdir}/erlang/man/man3/inviso_as_lib.* +%{_libdir}/erlang/man/man3/inviso_lfm.* +%{_libdir}/erlang/man/man3/inviso_lfm_tpfreader.* +%{_libdir}/erlang/man/man3/inviso_rt.* +%{_libdir}/erlang/man/man3/inviso_rt_meta.* %files jinterface %defattr(-,root,root) @@ -1150,6 +1348,39 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/kernel-*/ebin %{_libdir}/erlang/lib/kernel-*/include %{_libdir}/erlang/lib/kernel-*/src +%{_libdir}/erlang/man/man3/application.* +%{_libdir}/erlang/man/man3/auth.* +%{_libdir}/erlang/man/man3/code.* +%{_libdir}/erlang/man/man3/disk_log.* +%{_libdir}/erlang/man/man3/erl_boot_server.* +%{_libdir}/erlang/man/man3/erl_ddll.* +%{_libdir}/erlang/man/man3/erl_prim_loader_stub.* +%{_libdir}/erlang/man/man3/erlang_stub.* +%{_libdir}/erlang/man/man3/error_handler.* +%{_libdir}/erlang/man/man3/error_logger.* +%{_libdir}/erlang/man/man3/file.* +%{_libdir}/erlang/man/man3/gen_sctp.* +%{_libdir}/erlang/man/man3/gen_tcp.* +%{_libdir}/erlang/man/man3/gen_udp.* +%{_libdir}/erlang/man/man3/global.* +%{_libdir}/erlang/man/man3/global_group.* +%{_libdir}/erlang/man/man3/heart.* +%{_libdir}/erlang/man/man3/inet.* +%{_libdir}/erlang/man/man3/inet_res.* +%{_libdir}/erlang/man/man3/init_stub.* +%{_libdir}/erlang/man/man3/net_adm.* +%{_libdir}/erlang/man/man3/net_kernel.* +%{_libdir}/erlang/man/man3/os.* +%{_libdir}/erlang/man/man3/packages.* +%{_libdir}/erlang/man/man3/pg2.* +%{_libdir}/erlang/man/man3/rpc.* +%{_libdir}/erlang/man/man3/seq_trace.* +%{_libdir}/erlang/man/man3/user.* +%{_libdir}/erlang/man/man3/wrap_log_reader.* +%{_libdir}/erlang/man/man3/zlib_stub.* +%{_libdir}/erlang/man/man4/app.* +%{_libdir}/erlang/man/man4/config.* +%{_libdir}/erlang/man/man6/kernel.* %files megaco %defattr(-,root,root) @@ -1158,6 +1389,18 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/megaco-*/include %{_libdir}/erlang/lib/megaco-*/priv %{_libdir}/erlang/lib/megaco-*/src +%{_libdir}/erlang/man/man3/megaco.* +%{_libdir}/erlang/man/man3/megaco_codec_meas.* +%{_libdir}/erlang/man/man3/megaco_codec_mstone1.* +%{_libdir}/erlang/man/man3/megaco_codec_mstone2.* +%{_libdir}/erlang/man/man3/megaco_codec_transform.* +%{_libdir}/erlang/man/man3/megaco_edist_compress.* +%{_libdir}/erlang/man/man3/megaco_encoder.* +%{_libdir}/erlang/man/man3/megaco_flex_scanner.* +%{_libdir}/erlang/man/man3/megaco_tcp.* +%{_libdir}/erlang/man/man3/megaco_transport.* +%{_libdir}/erlang/man/man3/megaco_udp.* +%{_libdir}/erlang/man/man3/megaco_user.* %files mnesia %defattr(-,root,root) @@ -1165,14 +1408,21 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/mnesia-*/ebin %{_libdir}/erlang/lib/mnesia-*/include %{_libdir}/erlang/lib/mnesia-*/src +%{_libdir}/erlang/man/man3/mnesia.* +%{_libdir}/erlang/man/man3/mnesia_frag_hash.* +%{_libdir}/erlang/man/man3/mnesia_registry.* %files observer %defattr(-,root,root) %{_libdir}/erlang/lib/observer-*/ +%{_libdir}/erlang/man/man3/crashdump.* +%{_libdir}/erlang/man/man3/ttb.* +%{_libdir}/erlang/man/man6/observer.* %files odbc %defattr(-,root,root) %{_libdir}/erlang/lib/odbc-*/ +%{_libdir}/erlang/man/man3/odbc.* %files orber %defattr(-,root,root) @@ -1183,36 +1433,69 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/orber-*/java_src %{_libdir}/erlang/lib/orber-*/priv %{_libdir}/erlang/lib/orber-*/src +%{_libdir}/erlang/man/man3/CosNaming.* +%{_libdir}/erlang/man/man3/CosNaming_BindingIterator.* +%{_libdir}/erlang/man/man3/CosNaming_NamingContext.* +%{_libdir}/erlang/man/man3/CosNaming_NamingContextExt.* +%{_libdir}/erlang/man/man3/Module_Interface.* +%{_libdir}/erlang/man/man3/any.* +%{_libdir}/erlang/man/man3/corba.* +%{_libdir}/erlang/man/man3/corba_object.* +%{_libdir}/erlang/man/man3/etop.* +%{_libdir}/erlang/man/man3/fixed.* +%{_libdir}/erlang/man/man3/interceptors.* +%{_libdir}/erlang/man/man3/lname.* +%{_libdir}/erlang/man/man3/lname_component.* +%{_libdir}/erlang/man/man3/orber.* +%{_libdir}/erlang/man/man3/orber_acl.* +%{_libdir}/erlang/man/man3/orber_diagnostics.* +%{_libdir}/erlang/man/man3/orber_ifr.* +%{_libdir}/erlang/man/man3/orber_tc.* %files os_mon %defattr(-,root,root) %{_libdir}/erlang/lib/os_mon-*/ +%{_libdir}/erlang/man/man3/cpu_sup.* +%{_libdir}/erlang/man/man3/disksup.* +%{_libdir}/erlang/man/man3/memsup.* +%{_libdir}/erlang/man/man3/os_mon_mib.* +%{_libdir}/erlang/man/man3/os_sup.* +%{_libdir}/erlang/man/man6/os_mon.* %files otp_mibs %defattr(-,root,root) %{_libdir}/erlang/lib/otp_mibs-*/ +%{_libdir}/erlang/man/man3/otp_mib.* %files parsetools %defattr(-,root,root) %{_libdir}/erlang/lib/parsetools-*/ +%{_libdir}/erlang/man/man3/leex.* +%{_libdir}/erlang/man/man3/yecc.* %files percept %defattr(-,root,root) %{_libdir}/erlang/lib/percept-*/ +%{_libdir}/erlang/man/man3/egd.* +%{_libdir}/erlang/man/man3/percept.* +%{_libdir}/erlang/man/man3/percept_profile.* %files pman %defattr(-,root,root) %{_libdir}/erlang/lib/pman-*/ +%{_libdir}/erlang/man/man3/pman.* %files public_key %defattr(-,root,root) %{_libdir}/erlang/lib/public_key-*/ +%{_libdir}/erlang/man/man3/public_key.* %files reltool %defattr(-,root,root) %dir %{_libdir}/erlang/lib/reltool-*/ %{_libdir}/erlang/lib/reltool-*/ebin %{_libdir}/erlang/lib/reltool-*/src +%{_libdir}/erlang/man/man3/reltool.* %files rpm-macros %defattr(-,root,root) @@ -1225,10 +1508,23 @@ rm -rf $RPM_BUILD_ROOT %files runtime_tools %defattr(-,root,root) %{_libdir}/erlang/lib/runtime_tools-*/ +%{_libdir}/erlang/man/man3/dbg.* +%{_libdir}/erlang/man/man3/erts_alloc_config.* +%{_libdir}/erlang/man/man6/runtime_tools.* %files sasl %defattr(-,root,root) %{_libdir}/erlang/lib/sasl-*/ +%{_libdir}/erlang/man/man3/alarm_handler.* +%{_libdir}/erlang/man/man3/overload.* +%{_libdir}/erlang/man/man3/rb.* +%{_libdir}/erlang/man/man3/release_handler.* +%{_libdir}/erlang/man/man3/systools.* +%{_libdir}/erlang/man/man4/appup.* +%{_libdir}/erlang/man/man4/rel.* +%{_libdir}/erlang/man/man4/relup.* +%{_libdir}/erlang/man/man4/script.* +%{_libdir}/erlang/man/man6/sasl.* %files snmp %defattr(-,root,root) @@ -1238,10 +1534,62 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/snmp-*/mibs %{_libdir}/erlang/lib/snmp-*/priv %{_libdir}/erlang/lib/snmp-*/src +%{_libdir}/erlang/man/man3/snmp.* +%{_libdir}/erlang/man/man3/snmpa.* +%{_libdir}/erlang/man/man3/snmpa_conf.* +%{_libdir}/erlang/man/man3/snmpa_discovery_handler.* +%{_libdir}/erlang/man/man3/snmpa_error.* +%{_libdir}/erlang/man/man3/snmpa_error_io.* +%{_libdir}/erlang/man/man3/snmpa_error_logger.* +%{_libdir}/erlang/man/man3/snmpa_error_report.* +%{_libdir}/erlang/man/man3/snmpa_local_db.* +%{_libdir}/erlang/man/man3/snmpa_mpd.* +%{_libdir}/erlang/man/man3/snmpa_network_interface.* +%{_libdir}/erlang/man/man3/snmpa_network_interface_filter.* +%{_libdir}/erlang/man/man3/snmpa_notification_delivery_info_receiver.* +%{_libdir}/erlang/man/man3/snmpa_notification_filter.* +%{_libdir}/erlang/man/man3/snmpa_supervisor.* +%{_libdir}/erlang/man/man3/snmpc.* +%{_libdir}/erlang/man/man3/snmp_community_mib.* +%{_libdir}/erlang/man/man3/snmp_framework_mib.* +%{_libdir}/erlang/man/man3/snmp_generic.* +%{_libdir}/erlang/man/man3/snmp_index.* +%{_libdir}/erlang/man/man3/snmpm.* +%{_libdir}/erlang/man/man3/snmpm_conf.* +%{_libdir}/erlang/man/man3/snmpm_mpd.* +%{_libdir}/erlang/man/man3/snmpm_network_interface.* +%{_libdir}/erlang/man/man3/snmpm_network_interface_filter.* +%{_libdir}/erlang/man/man3/snmpm_user.* +%{_libdir}/erlang/man/man3/snmp_notification_mib.* +%{_libdir}/erlang/man/man3/snmp_pdus.* +%{_libdir}/erlang/man/man3/snmp_standard_mib.* +%{_libdir}/erlang/man/man3/snmp_target_mib.* +%{_libdir}/erlang/man/man3/snmp_user_based_sm_mib.* +%{_libdir}/erlang/man/man3/snmp_view_based_acm_mib.* +%{_libdir}/erlang/man/man6/snmp.* +%{_libdir}/erlang/man/man7/INET-ADDRESS-MIB.* +%{_libdir}/erlang/man/man7/OTP-SNMPEA-MIB.* +%{_libdir}/erlang/man/man7/RFC1213-MIB.* +%{_libdir}/erlang/man/man7/SNMP-COMMUNITY-MIB.* +%{_libdir}/erlang/man/man7/SNMP-FRAMEWORK-MIB.* +%{_libdir}/erlang/man/man7/SNMP-MPD-MIB.* +%{_libdir}/erlang/man/man7/SNMP-NOTIFICATION-MIB.* +%{_libdir}/erlang/man/man7/SNMP-TARGET-MIB.* +%{_libdir}/erlang/man/man7/SNMP-USER-BASED-SM-MIB.* +%{_libdir}/erlang/man/man7/SNMP-USM-AES-MIB.* +%{_libdir}/erlang/man/man7/SNMPv2-MIB.* +%{_libdir}/erlang/man/man7/SNMPv2-TM.* +%{_libdir}/erlang/man/man7/SNMP-VIEW-BASED-ACM-MIB.* +%{_libdir}/erlang/man/man7/STANDARD-MIB.* %files ssh %defattr(-,root,root) %{_libdir}/erlang/lib/ssh-*/ +%{_libdir}/erlang/man/man3/ssh.* +%{_libdir}/erlang/man/man3/ssh_channel.* +%{_libdir}/erlang/man/man3/ssh_connection.* +%{_libdir}/erlang/man/man3/ssh_sftp.* +%{_libdir}/erlang/man/man3/ssh_sftpd.* %files ssl %defattr(-,root,root) @@ -1251,6 +1599,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/ssl-*/pkix %{_libdir}/erlang/lib/ssl-*/priv %{_libdir}/erlang/lib/ssl-*/src +%{_libdir}/erlang/man/man3/new_ssl.* +%{_libdir}/erlang/man/man3/ssl.* +%{_libdir}/erlang/man/man6/ssl.* %files stdlib %defattr(-,root,root) @@ -1258,19 +1609,91 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/stdlib-*/ebin %{_libdir}/erlang/lib/stdlib-*/include %{_libdir}/erlang/lib/stdlib-*/src +%{_libdir}/erlang/man/man3/array.* +%{_libdir}/erlang/man/man3/base64.* +%{_libdir}/erlang/man/man3/beam_lib.* +%{_libdir}/erlang/man/man3/c.* +%{_libdir}/erlang/man/man3/calendar.* +%{_libdir}/erlang/man/man3/dets.* +%{_libdir}/erlang/man/man3/dict.* +%{_libdir}/erlang/man/man3/digraph.* +%{_libdir}/erlang/man/man3/digraph_utils.* +%{_libdir}/erlang/man/man3/epp.* +%{_libdir}/erlang/man/man3/erl_eval.* +%{_libdir}/erlang/man/man3/erl_expand_records.* +%{_libdir}/erlang/man/man3/erl_id_trans.* +%{_libdir}/erlang/man/man3/erl_internal.* +%{_libdir}/erlang/man/man3/erl_lint.* +%{_libdir}/erlang/man/man3/erl_parse.* +%{_libdir}/erlang/man/man3/erl_pp.* +%{_libdir}/erlang/man/man3/erl_scan.* +%{_libdir}/erlang/man/man3/erl_tar.* +%{_libdir}/erlang/man/man3/ets.* +%{_libdir}/erlang/man/man3/file_sorter.* +%{_libdir}/erlang/man/man3/filelib.* +%{_libdir}/erlang/man/man3/filename.* +%{_libdir}/erlang/man/man3/gb_sets.* +%{_libdir}/erlang/man/man3/gb_trees.* +%{_libdir}/erlang/man/man3/gen_event.* +%{_libdir}/erlang/man/man3/gen_fsm.* +%{_libdir}/erlang/man/man3/gen_server.* +%{_libdir}/erlang/man/man3/io.* +%{_libdir}/erlang/man/man3/io_lib.* +%{_libdir}/erlang/man/man3/lib.* +%{_libdir}/erlang/man/man3/lists.* +%{_libdir}/erlang/man/man3/log_mf_h.* +%{_libdir}/erlang/man/man3/math.* +%{_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/random.* +%{_libdir}/erlang/man/man3/re.* +%{_libdir}/erlang/man/man3/regexp.* +%{_libdir}/erlang/man/man3/sets.* +%{_libdir}/erlang/man/man3/shell.* +%{_libdir}/erlang/man/man3/shell_default.* +%{_libdir}/erlang/man/man3/slave.* +%{_libdir}/erlang/man/man3/sofs.* +%{_libdir}/erlang/man/man3/string.* +%{_libdir}/erlang/man/man3/supervisor.* +%{_libdir}/erlang/man/man3/supervisor_bridge.* +%{_libdir}/erlang/man/man3/sys.* +%{_libdir}/erlang/man/man3/timer.* +%{_libdir}/erlang/man/man3/unicode.* +%{_libdir}/erlang/man/man3/zip.* +%{_libdir}/erlang/man/man6/stdlib.* %files syntax_tools %defattr(-,root,root) %dir %{_libdir}/erlang/lib/syntax_tools-*/ %{_libdir}/erlang/lib/syntax_tools-*/ebin +%{_libdir}/erlang/man/man3/epp_dodger.* +%{_libdir}/erlang/man/man3/erl_comment_scan.* +%{_libdir}/erlang/man/man3/erl_prettypr.* +%{_libdir}/erlang/man/man3/erl_recomment.* +%{_libdir}/erlang/man/man3/erl_syntax.* +%{_libdir}/erlang/man/man3/erl_syntax_lib.* +%{_libdir}/erlang/man/man3/erl_tidy.* +%{_libdir}/erlang/man/man3/igor.* +%{_libdir}/erlang/man/man3/prettypr.* %files test_server %defattr(-,root,root) %{_libdir}/erlang/lib/test_server-*/ +%{_libdir}/erlang/man/man3/test_server.* +%{_libdir}/erlang/man/man3/test_server_ctrl.* +%{_libdir}/erlang/man/man6/test_server.* %files toolbar %defattr(-,root,root) %{_libdir}/erlang/lib/toolbar-*/ +%{_libdir}/erlang/man/man3/toolbar.* %files tools %defattr(-,root,root) @@ -1280,18 +1703,34 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/tools-*/emacs %{_libdir}/erlang/lib/tools-*/priv %{_libdir}/erlang/lib/tools-*/src +%{_libdir}/erlang/man/man3/cover.* +%{_libdir}/erlang/man/man3/cprof.* +%{_libdir}/erlang/man/man3/eprof.* +%{_libdir}/erlang/man/man3/erlang_mode.* +%{_libdir}/erlang/man/man3/fprof.* +%{_libdir}/erlang/man/man3/instrument.* +%{_libdir}/erlang/man/man3/lcnt.* +%{_libdir}/erlang/man/man3/make.* +%{_libdir}/erlang/man/man3/tags.* +%{_libdir}/erlang/man/man3/xref.* %files tv %defattr(-,root,root) %{_libdir}/erlang/lib/tv-*/ +%{_libdir}/erlang/man/man3/tv.* %files typer %defattr(-,root,root) +%{_bindir}/typer +%{_libdir}/erlang/bin/typer +%{_libdir}/erlang/erts-*/bin/typer %{_libdir}/erlang/lib/typer-*/ %files webtool %defattr(-,root,root) %{_libdir}/erlang/lib/webtool-*/ +%{_libdir}/erlang/man/man1/start_webtool.* +%{_libdir}/erlang/man/man3/webtool.* %files wx %defattr(-,root,root) @@ -1300,13 +1739,238 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/wx-*/include %{_libdir}/erlang/lib/wx-*/priv %{_libdir}/erlang/lib/wx-*/src +%{_libdir}/erlang/man/man3/gl.* +%{_libdir}/erlang/man/man3/glu.* +%{_libdir}/erlang/man/man3/wx.* +%{_libdir}/erlang/man/man3/wx_misc.* +%{_libdir}/erlang/man/man3/wx_object.* +%{_libdir}/erlang/man/man3/wxAcceleratorEntry.* +%{_libdir}/erlang/man/man3/wxAcceleratorTable.* +%{_libdir}/erlang/man/man3/wxArtProvider.* +%{_libdir}/erlang/man/man3/wxAuiDockArt.* +%{_libdir}/erlang/man/man3/wxAuiManager.* +%{_libdir}/erlang/man/man3/wxAuiManagerEvent.* +%{_libdir}/erlang/man/man3/wxAuiNotebook.* +%{_libdir}/erlang/man/man3/wxAuiNotebookEvent.* +%{_libdir}/erlang/man/man3/wxAuiPaneInfo.* +%{_libdir}/erlang/man/man3/wxAuiTabArt.* +%{_libdir}/erlang/man/man3/wxBitmap.* +%{_libdir}/erlang/man/man3/wxBitmapButton.* +%{_libdir}/erlang/man/man3/wxBitmapDataObject.* +%{_libdir}/erlang/man/man3/wxBoxSizer.* +%{_libdir}/erlang/man/man3/wxBrush.* +%{_libdir}/erlang/man/man3/wxBufferedDC.* +%{_libdir}/erlang/man/man3/wxBufferedPaintDC.* +%{_libdir}/erlang/man/man3/wxButton.* +%{_libdir}/erlang/man/man3/wxCalendarCtrl.* +%{_libdir}/erlang/man/man3/wxCalendarDateAttr.* +%{_libdir}/erlang/man/man3/wxCalendarEvent.* +%{_libdir}/erlang/man/man3/wxCaret.* +%{_libdir}/erlang/man/man3/wxCheckBox.* +%{_libdir}/erlang/man/man3/wxCheckListBox.* +%{_libdir}/erlang/man/man3/wxChildFocusEvent.* +%{_libdir}/erlang/man/man3/wxChoice.* +%{_libdir}/erlang/man/man3/wxChoicebook.* +%{_libdir}/erlang/man/man3/wxClientDC.* +%{_libdir}/erlang/man/man3/wxClipboard.* +%{_libdir}/erlang/man/man3/wxCloseEvent.* +%{_libdir}/erlang/man/man3/wxColourData.* +%{_libdir}/erlang/man/man3/wxColourDialog.* +%{_libdir}/erlang/man/man3/wxColourPickerCtrl.* +%{_libdir}/erlang/man/man3/wxColourPickerEvent.* +%{_libdir}/erlang/man/man3/wxComboBox.* +%{_libdir}/erlang/man/man3/wxCommandEvent.* +%{_libdir}/erlang/man/man3/wxContextMenuEvent.* +%{_libdir}/erlang/man/man3/wxControl.* +%{_libdir}/erlang/man/man3/wxControlWithItems.* +%{_libdir}/erlang/man/man3/wxCursor.* +%{_libdir}/erlang/man/man3/wxDataObject.* +%{_libdir}/erlang/man/man3/wxDateEvent.* +%{_libdir}/erlang/man/man3/wxDatePickerCtrl.* +%{_libdir}/erlang/man/man3/wxDC.* +%{_libdir}/erlang/man/man3/wxDialog.* +%{_libdir}/erlang/man/man3/wxDirDialog.* +%{_libdir}/erlang/man/man3/wxDirPickerCtrl.* +%{_libdir}/erlang/man/man3/wxDisplayChangedEvent.* +%{_libdir}/erlang/man/man3/wxEraseEvent.* +%{_libdir}/erlang/man/man3/wxEvent.* +%{_libdir}/erlang/man/man3/wxEvtHandler.* +%{_libdir}/erlang/man/man3/wxFileDataObject.* +%{_libdir}/erlang/man/man3/wxFileDialog.* +%{_libdir}/erlang/man/man3/wxFileDirPickerEvent.* +%{_libdir}/erlang/man/man3/wxFilePickerCtrl.* +%{_libdir}/erlang/man/man3/wxFindReplaceData.* +%{_libdir}/erlang/man/man3/wxFindReplaceDialog.* +%{_libdir}/erlang/man/man3/wxFlexGridSizer.* +%{_libdir}/erlang/man/man3/wxFocusEvent.* +%{_libdir}/erlang/man/man3/wxFont.* +%{_libdir}/erlang/man/man3/wxFontData.* +%{_libdir}/erlang/man/man3/wxFontDialog.* +%{_libdir}/erlang/man/man3/wxFontPickerCtrl.* +%{_libdir}/erlang/man/man3/wxFontPickerEvent.* +%{_libdir}/erlang/man/man3/wxFrame.* +%{_libdir}/erlang/man/man3/wxGauge.* +%{_libdir}/erlang/man/man3/wxGBSizerItem.* +%{_libdir}/erlang/man/man3/wxGenericDirCtrl.* +%{_libdir}/erlang/man/man3/wxGLCanvas.* +%{_libdir}/erlang/man/man3/wxGraphicsBrush.* +%{_libdir}/erlang/man/man3/wxGraphicsContext.* +%{_libdir}/erlang/man/man3/wxGraphicsFont.* +%{_libdir}/erlang/man/man3/wxGraphicsMatrix.* +%{_libdir}/erlang/man/man3/wxGraphicsObject.* +%{_libdir}/erlang/man/man3/wxGraphicsPath.* +%{_libdir}/erlang/man/man3/wxGraphicsPen.* +%{_libdir}/erlang/man/man3/wxGraphicsRenderer.* +%{_libdir}/erlang/man/man3/wxGrid.* +%{_libdir}/erlang/man/man3/wxGridBagSizer.* +%{_libdir}/erlang/man/man3/wxGridCellAttr.* +%{_libdir}/erlang/man/man3/wxGridCellBoolEditor.* +%{_libdir}/erlang/man/man3/wxGridCellBoolRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellChoiceEditor.* +%{_libdir}/erlang/man/man3/wxGridCellEditor.* +%{_libdir}/erlang/man/man3/wxGridCellFloatEditor.* +%{_libdir}/erlang/man/man3/wxGridCellFloatRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellNumberEditor.* +%{_libdir}/erlang/man/man3/wxGridCellNumberRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellStringRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellTextEditor.* +%{_libdir}/erlang/man/man3/wxGridEvent.* +%{_libdir}/erlang/man/man3/wxGridSizer.* +%{_libdir}/erlang/man/man3/wxHelpEvent.* +%{_libdir}/erlang/man/man3/wxHtmlEasyPrinting.* +%{_libdir}/erlang/man/man3/wxHtmlLinkEvent.* +%{_libdir}/erlang/man/man3/wxHtmlWindow.* +%{_libdir}/erlang/man/man3/wxIcon.* +%{_libdir}/erlang/man/man3/wxIconBundle.* +%{_libdir}/erlang/man/man3/wxIconizeEvent.* +%{_libdir}/erlang/man/man3/wxIdleEvent.* +%{_libdir}/erlang/man/man3/wxImage.* +%{_libdir}/erlang/man/man3/wxImageList.* +%{_libdir}/erlang/man/man3/wxJoystickEvent.* +%{_libdir}/erlang/man/man3/wxKeyEvent.* +%{_libdir}/erlang/man/man3/wxLayoutAlgorithm.* +%{_libdir}/erlang/man/man3/wxListbook.* +%{_libdir}/erlang/man/man3/wxListBox.* +%{_libdir}/erlang/man/man3/wxListCtrl.* +%{_libdir}/erlang/man/man3/wxListEvent.* +%{_libdir}/erlang/man/man3/wxListItem.* +%{_libdir}/erlang/man/man3/wxListView.* +%{_libdir}/erlang/man/man3/wxLogNull.* +%{_libdir}/erlang/man/man3/wxMask.* +%{_libdir}/erlang/man/man3/wxMaximizeEvent.* +%{_libdir}/erlang/man/man3/wxMDIChildFrame.* +%{_libdir}/erlang/man/man3/wxMDIClientWindow.* +%{_libdir}/erlang/man/man3/wxMDIParentFrame.* +%{_libdir}/erlang/man/man3/wxMemoryDC.* +%{_libdir}/erlang/man/man3/wxMenu.* +%{_libdir}/erlang/man/man3/wxMenuBar.* +%{_libdir}/erlang/man/man3/wxMenuEvent.* +%{_libdir}/erlang/man/man3/wxMenuItem.* +%{_libdir}/erlang/man/man3/wxMessageDialog.* +%{_libdir}/erlang/man/man3/wxMiniFrame.* +%{_libdir}/erlang/man/man3/wxMirrorDC.* +%{_libdir}/erlang/man/man3/wxMouseCaptureChangedEvent.* +%{_libdir}/erlang/man/man3/wxMouseEvent.* +%{_libdir}/erlang/man/man3/wxMoveEvent.* +%{_libdir}/erlang/man/man3/wxMultiChoiceDialog.* +%{_libdir}/erlang/man/man3/wxNavigationKeyEvent.* +%{_libdir}/erlang/man/man3/wxNcPaintEvent.* +%{_libdir}/erlang/man/man3/wxNotebook.* +%{_libdir}/erlang/man/man3/wxNotebookEvent.* +%{_libdir}/erlang/man/man3/wxNotifyEvent.* +%{_libdir}/erlang/man/man3/wxPageSetupDialog.* +%{_libdir}/erlang/man/man3/wxPageSetupDialogData.* +%{_libdir}/erlang/man/man3/wxPaintDC.* +%{_libdir}/erlang/man/man3/wxPaintEvent.* +%{_libdir}/erlang/man/man3/wxPalette.* +%{_libdir}/erlang/man/man3/wxPaletteChangedEvent.* +%{_libdir}/erlang/man/man3/wxPanel.* +%{_libdir}/erlang/man/man3/wxPasswordEntryDialog.* +%{_libdir}/erlang/man/man3/wxPen.* +%{_libdir}/erlang/man/man3/wxPickerBase.* +%{_libdir}/erlang/man/man3/wxPostScriptDC.* +%{_libdir}/erlang/man/man3/wxPreviewCanvas.* +%{_libdir}/erlang/man/man3/wxPreviewControlBar.* +%{_libdir}/erlang/man/man3/wxPreviewFrame.* +%{_libdir}/erlang/man/man3/wxPrintData.* +%{_libdir}/erlang/man/man3/wxPrintDialog.* +%{_libdir}/erlang/man/man3/wxPrintDialogData.* +%{_libdir}/erlang/man/man3/wxPrinter.* +%{_libdir}/erlang/man/man3/wxPrintout.* +%{_libdir}/erlang/man/man3/wxPrintPreview.* +%{_libdir}/erlang/man/man3/wxProgressDialog.* +%{_libdir}/erlang/man/man3/wxQueryNewPaletteEvent.* +%{_libdir}/erlang/man/man3/wxRadioBox.* +%{_libdir}/erlang/man/man3/wxRadioButton.* +%{_libdir}/erlang/man/man3/wxRegion.* +%{_libdir}/erlang/man/man3/wxSashEvent.* +%{_libdir}/erlang/man/man3/wxSashLayoutWindow.* +%{_libdir}/erlang/man/man3/wxSashWindow.* +%{_libdir}/erlang/man/man3/wxScreenDC.* +%{_libdir}/erlang/man/man3/wxScrollBar.* +%{_libdir}/erlang/man/man3/wxScrolledWindow.* +%{_libdir}/erlang/man/man3/wxScrollEvent.* +%{_libdir}/erlang/man/man3/wxScrollWinEvent.* +%{_libdir}/erlang/man/man3/wxSetCursorEvent.* +%{_libdir}/erlang/man/man3/wxShowEvent.* +%{_libdir}/erlang/man/man3/wxSingleChoiceDialog.* +%{_libdir}/erlang/man/man3/wxSizeEvent.* +%{_libdir}/erlang/man/man3/wxSizer.* +%{_libdir}/erlang/man/man3/wxSizerFlags.* +%{_libdir}/erlang/man/man3/wxSizerItem.* +%{_libdir}/erlang/man/man3/wxSlider.* +%{_libdir}/erlang/man/man3/wxSpinButton.* +%{_libdir}/erlang/man/man3/wxSpinCtrl.* +%{_libdir}/erlang/man/man3/wxSpinEvent.* +%{_libdir}/erlang/man/man3/wxSplashScreen.* +%{_libdir}/erlang/man/man3/wxSplitterEvent.* +%{_libdir}/erlang/man/man3/wxSplitterWindow.* +%{_libdir}/erlang/man/man3/wxStaticBitmap.* +%{_libdir}/erlang/man/man3/wxStaticBox.* +%{_libdir}/erlang/man/man3/wxStaticBoxSizer.* +%{_libdir}/erlang/man/man3/wxStaticLine.* +%{_libdir}/erlang/man/man3/wxStaticText.* +%{_libdir}/erlang/man/man3/wxStatusBar.* +%{_libdir}/erlang/man/man3/wxStdDialogButtonSizer.* +%{_libdir}/erlang/man/man3/wxStyledTextCtrl.* +%{_libdir}/erlang/man/man3/wxStyledTextEvent.* +%{_libdir}/erlang/man/man3/wxSysColourChangedEvent.* +%{_libdir}/erlang/man/man3/wxTextAttr.* +%{_libdir}/erlang/man/man3/wxTextCtrl.* +%{_libdir}/erlang/man/man3/wxTextDataObject.* +%{_libdir}/erlang/man/man3/wxTextEntryDialog.* +%{_libdir}/erlang/man/man3/wxToggleButton.* +%{_libdir}/erlang/man/man3/wxToolBar.* +%{_libdir}/erlang/man/man3/wxToolbook.* +%{_libdir}/erlang/man/man3/wxToolTip.* +%{_libdir}/erlang/man/man3/wxTopLevelWindow.* +%{_libdir}/erlang/man/man3/wxTreebook.* +%{_libdir}/erlang/man/man3/wxTreeCtrl.* +%{_libdir}/erlang/man/man3/wxTreeEvent.* +%{_libdir}/erlang/man/man3/wxUpdateUIEvent.* +%{_libdir}/erlang/man/man3/wxWindow.* +%{_libdir}/erlang/man/man3/wxWindowCreateEvent.* +%{_libdir}/erlang/man/man3/wxWindowDC.* +%{_libdir}/erlang/man/man3/wxWindowDestroyEvent.* +%{_libdir}/erlang/man/man3/wxXmlResource.* %files xmerl %defattr(-,root,root) %{_libdir}/erlang/lib/xmerl-*/ +%{_libdir}/erlang/man/man3/xmerl.* +%{_libdir}/erlang/man/man3/xmerl_eventp.* +%{_libdir}/erlang/man/man3/xmerl_sax_parser.* +%{_libdir}/erlang/man/man3/xmerl_scan.* +%{_libdir}/erlang/man/man3/xmerl_xpath.* +%{_libdir}/erlang/man/man3/xmerl_xs.* +%{_libdir}/erlang/man/man3/xmerl_xsd.* %changelog +* Sat May 15 2010 Peter Lemenkov - R13B-04.12 +- Moved dialyzer and typer executables from erts to appropriate rpms + * Fri May 14 2010 Peter Lemenkov - R13B-04.11 - Do not mention nteventlog in os_mon.app, see rhbz #592251 diff --git a/import.log b/import.log index 834a79d..ce48027 100644 --- a/import.log +++ b/import.log @@ -7,3 +7,4 @@ erlang-R13B-04_6_fc12:F-12:erlang-R13B-04.6.fc12.src.rpm:1272303739 erlang-R13B-04_9_fc12:F-12:erlang-R13B-04.9.fc12.src.rpm:1272528494 erlang-R13B-04_11_fc12:EL-6:erlang-R13B-04.11.fc12.src.rpm:1273841835 erlang-R13B-04_11_fc12_3:EL-6:erlang-R13B-04.11.fc12.3.src.rpm:1273892386 +erlang-R13B-04_12_fc12:EL-6:erlang-R13B-04.12.fc12.src.rpm:1273901178 -- cgit From e1766ff03d570fa76ed5e1fce4902c4ed2e2647d Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 17 May 2010 14:17:28 +0000 Subject: Moved typer and dialyzer binaries to proper sub-packages --- erlang.spec | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++---- import.log | 1 + 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/erlang.spec b/erlang.spec index 2deedb8..a29647a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.11%{?dist} +Release: %{rel}.12%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -943,6 +943,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/tools-*/c_src rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/man # remove unneeded files +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/info rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/*-*/info rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/hipe-*/vsn.mk @@ -1123,6 +1124,9 @@ rm -rf $RPM_BUILD_ROOT %files dialyzer %defattr(-,root,root) +%{_bindir}/dialyzer +%{_libdir}/erlang/bin/dialyzer +%{_libdir}/erlang/erts-*/bin/dialyzer %{_libdir}/erlang/lib/dialyzer-*/ %{_libdir}/erlang/man/man3/dialyzer.* @@ -1185,9 +1189,45 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/erlang/man/man7/ %dir %{_libdir}/erlang/releases/ -%{_bindir}/* -%{_libdir}/erlang/bin/* -%{_libdir}/erlang/erts-*/ +%{_bindir}/epmd +%{_bindir}/erl +%{_bindir}/erlc +%{_bindir}/escript +%{_bindir}/run_erl +%{_bindir}/to_erl +%{_libdir}/erlang/bin/epmd +%{_libdir}/erlang/bin/erl +%{_libdir}/erlang/bin/erlc +%{_libdir}/erlang/bin/escript +%{_libdir}/erlang/bin/run_erl +%{_libdir}/erlang/bin/start +%{_libdir}/erlang/bin/start.boot +%{_libdir}/erlang/bin/start.script +%{_libdir}/erlang/bin/start_clean.boot +%{_libdir}/erlang/bin/start_erl +%{_libdir}/erlang/bin/start_sasl.boot +%{_libdir}/erlang/bin/to_erl +%dir %{_libdir}/erlang/erts-*/bin +%{_libdir}/erlang/erts-*/bin/beam +%{_libdir}/erlang/erts-*/bin/beam.smp +%{_libdir}/erlang/erts-*/bin/child_setup +%{_libdir}/erlang/erts-*/bin/dyn_erl +%{_libdir}/erlang/erts-*/bin/epmd +%{_libdir}/erlang/erts-*/bin/erl +%{_libdir}/erlang/erts-*/bin/erl.src +%{_libdir}/erlang/erts-*/bin/erlc +%{_libdir}/erlang/erts-*/bin/erlexec +%{_libdir}/erlang/erts-*/bin/escript +%{_libdir}/erlang/erts-*/bin/heart +%{_libdir}/erlang/erts-*/bin/inet_gethost +%{_libdir}/erlang/erts-*/bin/run_erl +%{_libdir}/erlang/erts-*/bin/start +%{_libdir}/erlang/erts-*/bin/start.src +%{_libdir}/erlang/erts-*/bin/start_erl.src +%{_libdir}/erlang/erts-*/bin/to_erl +%{_libdir}/erlang/erts-*/include +%{_libdir}/erlang/erts-*/lib +%{_libdir}/erlang/erts-*/src %{_libdir}/erlang/lib/erts-*/ %{_libdir}/erlang/man/man1/epmd.* %{_libdir}/erlang/man/man1/erl.* @@ -1681,6 +1721,9 @@ rm -rf $RPM_BUILD_ROOT %files typer %defattr(-,root,root) +%{_bindir}/typer +%{_libdir}/erlang/bin/typer +%{_libdir}/erlang/erts-*/bin/typer %{_libdir}/erlang/lib/typer-*/ %files webtool @@ -1925,6 +1968,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 15 2010 Peter Lemenkov - R13B-04.12 +- Moved dialyzer and typer executables from erts to appropriate rpms + * Fri May 14 2010 Peter Lemenkov - R13B-04.11 - Do not mention nteventlog in os_mon.app, see rhbz #592251 diff --git a/import.log b/import.log index c799055..3b1de7e 100644 --- a/import.log +++ b/import.log @@ -6,3 +6,4 @@ erlang-R13B-04_5_fc12:F-13:erlang-R13B-04.5.fc12.src.rpm:1272271184 erlang-R13B-04_6_fc12:F-13:erlang-R13B-04.6.fc12.src.rpm:1272303676 erlang-R13B-04_9_fc12:F-13:erlang-R13B-04.9.fc12.src.rpm:1272528169 erlang-R13B-04_11_fc12:F-13:erlang-R13B-04.11.fc12.src.rpm:1273841704 +erlang-R13B-04_12_fc12:F-13:erlang-R13B-04.12.fc12.src.rpm:1274105816 -- cgit From 4d7955c9513e94ce14e549602668e56621eb0d10 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 17 May 2010 14:22:52 +0000 Subject: Moved typer and dialyzer binaries to proper sub-packages --- erlang.spec | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++---- import.log | 1 + 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/erlang.spec b/erlang.spec index 2deedb8..a29647a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.11%{?dist} +Release: %{rel}.12%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -943,6 +943,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/tools-*/c_src rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/man # remove unneeded files +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/info rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/*-*/info rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/hipe-*/vsn.mk @@ -1123,6 +1124,9 @@ rm -rf $RPM_BUILD_ROOT %files dialyzer %defattr(-,root,root) +%{_bindir}/dialyzer +%{_libdir}/erlang/bin/dialyzer +%{_libdir}/erlang/erts-*/bin/dialyzer %{_libdir}/erlang/lib/dialyzer-*/ %{_libdir}/erlang/man/man3/dialyzer.* @@ -1185,9 +1189,45 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/erlang/man/man7/ %dir %{_libdir}/erlang/releases/ -%{_bindir}/* -%{_libdir}/erlang/bin/* -%{_libdir}/erlang/erts-*/ +%{_bindir}/epmd +%{_bindir}/erl +%{_bindir}/erlc +%{_bindir}/escript +%{_bindir}/run_erl +%{_bindir}/to_erl +%{_libdir}/erlang/bin/epmd +%{_libdir}/erlang/bin/erl +%{_libdir}/erlang/bin/erlc +%{_libdir}/erlang/bin/escript +%{_libdir}/erlang/bin/run_erl +%{_libdir}/erlang/bin/start +%{_libdir}/erlang/bin/start.boot +%{_libdir}/erlang/bin/start.script +%{_libdir}/erlang/bin/start_clean.boot +%{_libdir}/erlang/bin/start_erl +%{_libdir}/erlang/bin/start_sasl.boot +%{_libdir}/erlang/bin/to_erl +%dir %{_libdir}/erlang/erts-*/bin +%{_libdir}/erlang/erts-*/bin/beam +%{_libdir}/erlang/erts-*/bin/beam.smp +%{_libdir}/erlang/erts-*/bin/child_setup +%{_libdir}/erlang/erts-*/bin/dyn_erl +%{_libdir}/erlang/erts-*/bin/epmd +%{_libdir}/erlang/erts-*/bin/erl +%{_libdir}/erlang/erts-*/bin/erl.src +%{_libdir}/erlang/erts-*/bin/erlc +%{_libdir}/erlang/erts-*/bin/erlexec +%{_libdir}/erlang/erts-*/bin/escript +%{_libdir}/erlang/erts-*/bin/heart +%{_libdir}/erlang/erts-*/bin/inet_gethost +%{_libdir}/erlang/erts-*/bin/run_erl +%{_libdir}/erlang/erts-*/bin/start +%{_libdir}/erlang/erts-*/bin/start.src +%{_libdir}/erlang/erts-*/bin/start_erl.src +%{_libdir}/erlang/erts-*/bin/to_erl +%{_libdir}/erlang/erts-*/include +%{_libdir}/erlang/erts-*/lib +%{_libdir}/erlang/erts-*/src %{_libdir}/erlang/lib/erts-*/ %{_libdir}/erlang/man/man1/epmd.* %{_libdir}/erlang/man/man1/erl.* @@ -1681,6 +1721,9 @@ rm -rf $RPM_BUILD_ROOT %files typer %defattr(-,root,root) +%{_bindir}/typer +%{_libdir}/erlang/bin/typer +%{_libdir}/erlang/erts-*/bin/typer %{_libdir}/erlang/lib/typer-*/ %files webtool @@ -1925,6 +1968,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 15 2010 Peter Lemenkov - R13B-04.12 +- Moved dialyzer and typer executables from erts to appropriate rpms + * Fri May 14 2010 Peter Lemenkov - R13B-04.11 - Do not mention nteventlog in os_mon.app, see rhbz #592251 diff --git a/import.log b/import.log index 264f6a2..ab393de 100644 --- a/import.log +++ b/import.log @@ -6,3 +6,4 @@ erlang-R13B-04_5_fc12:F-12:erlang-R13B-04.5.fc12.src.rpm:1272271343 erlang-R13B-04_6_fc12:F-12:erlang-R13B-04.6.fc12.src.rpm:1272303739 erlang-R13B-04_9_fc12:F-12:erlang-R13B-04.9.fc12.src.rpm:1272528494 erlang-R13B-04_11_fc12:F-12:erlang-R13B-04.11.fc12.src.rpm:1273841768 +erlang-R13B-04_12_fc12:F-12:erlang-R13B-04.12.fc12.src.rpm:1274105878 -- cgit From 688a239bab76f33895d2d92110fa7a45a01698aa Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 7 Jun 2010 07:58:21 +0000 Subject: Add virtual provides for each erlang module, contained in this package. This will greatly reduce the number of ifdefs in erlang-related spec-files. --- erlang.spec | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 59 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 5e775da..e249fb6 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.8%{?dist} +Release: %{rel}.9%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -27,7 +27,7 @@ BuildRequires: unixODBC-devel BuildRequires: tcl-devel BuildRequires: tk-devel BuildRequires: gd-devel -%if 0%{?rhel} +%if 0%{?el4}%{?el5} BuildRequires: java-1.4.2-gcj-compat-devel %else BuildRequires: java-1.5.0-gcj-devel @@ -37,6 +37,57 @@ BuildRequires: m4 Requires: tk +# Added virtual Provides for each erlang module +Provides: erlang-appmon = %{version}-%{release} +Provides: erlang-asn1 = %{version}-%{release} +Provides: erlang-common_test = %{version}-%{release} +Provides: erlang-compiler = %{version}-%{release} +Provides: erlang-cosEvent = %{version}-%{release} +Provides: erlang-cosEventDomain = %{version}-%{release} +Provides: erlang-cosFileTransfer = %{version}-%{release} +Provides: erlang-cosNotification = %{version}-%{release} +Provides: erlang-cosProperty = %{version}-%{release} +Provides: erlang-cosTime = %{version}-%{release} +Provides: erlang-cosTransactions = %{version}-%{release} +Provides: erlang-crypto = %{version}-%{release} +Provides: erlang-debugger = %{version}-%{release} +Provides: erlang-dialyzer = %{version}-%{release} +Provides: erlang-docbuilder = %{version}-%{release} +Provides: erlang-edoc = %{version}-%{release} +Provides: erlang-et = %{version}-%{release} +Provides: erlang-eunit = %{version}-%{release} +Provides: erlang-gs = %{version}-%{release} +Provides: erlang-hipe = %{version}-%{release} +Provides: erlang-ic = %{version}-%{release} +Provides: erlang-inets = %{version}-%{release} +Provides: erlang-inviso = %{version}-%{release} +Provides: erlang-kernel = %{version}-%{release} +Provides: erlang-megaco = %{version}-%{release} +Provides: erlang-mnesia = %{version}-%{release} +Provides: erlang-observer = %{version}-%{release} +Provides: erlang-odbc = %{version}-%{release} +Provides: erlang-orber = %{version}-%{release} +Provides: erlang-os_mon = %{version}-%{release} +Provides: erlang-otp_mibs = %{version}-%{release} +Provides: erlang-parsetools = %{version}-%{release} +Provides: erlang-percept = %{version}-%{release} +Provides: erlang-pman = %{version}-%{release} +Provides: erlang-public_key = %{version}-%{release} +Provides: erlang-runtime_tools = %{version}-%{release} +Provides: erlang-sasl = %{version}-%{release} +Provides: erlang-snmp = %{version}-%{release} +Provides: erlang-ssh = %{version}-%{release} +Provides: erlang-ssl = %{version}-%{release} +Provides: erlang-stdlib = %{version}-%{release} +Provides: erlang-syntax_tools = %{version}-%{release} +Provides: erlang-test_server = %{version}-%{release} +Provides: erlang-toolbar = %{version}-%{release} +Provides: erlang-tools = %{version}-%{release} +Provides: erlang-tv = %{version}-%{release} +Provides: erlang-typer = %{version}-%{release} +Provides: erlang-webtool = %{version}-%{release} +Provides: erlang-xmerl = %{version}-%{release} + %description Erlang is a general-purpose programming language and runtime environment. Erlang has built-in support for concurrency, distribution @@ -55,7 +106,7 @@ Documentation for Erlang. %prep %setup -q -n otp_src_%{ver}-%{rel} %patch1 -p1 -b .links -%patch2 -p1 -b .fyx_epmd_symlink +%patch2 -p1 -b .fix_epmd_symlink %patch3 -p1 -b .manpages %patch4 -p1 -b .rpath_removal %patch5 -p1 -b .missing_ssl_libraries @@ -135,6 +186,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 25 2010 Peter Lemenkov - R12B-5.9 +- Use java-1.4.2 only for EL-[45] +- Added virtual provides for each erlang module +- Small typo fix + * Mon Apr 19 2010 Peter Lemenkov - R12B-5.8 - Patches rebased - Added patches 6,7 from trunk -- cgit From 8745bc1fdffb8928bf54d974d161633bd036f8dd Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 7 Jun 2010 08:17:18 +0000 Subject: Add virtual provides for each erlang module, contained in this package. This will greatly reduce the number of ifdefs in erlang-related spec-files. Also this doesn't affect API/ABI so it's safe. --- erlang.spec | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index da3d089..acc2086 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,6 +1,6 @@ Name: erlang Version: R11B -Release: 2.4%{?dist} +Release: 2.5%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -27,7 +27,50 @@ BuildRequires: tk-devel BuildRequires: java-1.4.2-gcj-compat-devel BuildRequires: flex BuildRequires: m4 - +Provides: erlang-appmon = %{version}-%{release} +Provides: erlang-asn1 = %{version}-%{release} +Provides: erlang-compiler = %{version}-%{release} +Provides: erlang-cosEvent = %{version}-%{release} +Provides: erlang-cosEventDomain = %{version}-%{release} +Provides: erlang-cosFileTransfer = %{version}-%{release} +Provides: erlang-cosNotification = %{version}-%{release} +Provides: erlang-cosProperty = %{version}-%{release} +Provides: erlang-cosTime = %{version}-%{release} +Provides: erlang-cosTransactions = %{version}-%{release} +Provides: erlang-crypto = %{version}-%{release} +Provides: erlang-debugger = %{version}-%{release} +Provides: erlang-dialyzer = %{version}-%{release} +Provides: erlang-edoc = %{version}-%{release} +Provides: erlang-et = %{version}-%{release} +Provides: erlang-gs = %{version}-%{release} +Provides: erlang-hipe = %{version}-%{release} +Provides: erlang-ic = %{version}-%{release} +Provides: erlang-inets = %{version}-%{release} +Provides: erlang-inviso = %{version}-%{release} +Provides: erlang-kernel = %{version}-%{release} +Provides: erlang-megaco = %{version}-%{release} +Provides: erlang-mnemosyne = %{version}-%{release} +Provides: erlang-mnesia = %{version}-%{release} +Provides: erlang-mnesia_session = %{version}-%{release} +Provides: erlang-observer = %{version}-%{release} +Provides: erlang-odbc = %{version}-%{release} +Provides: erlang-orber = %{version}-%{release} +Provides: erlang-os_mon = %{version}-%{release} +Provides: erlang-otp_mibs = %{version}-%{release} +Provides: erlang-parsetools = %{version}-%{release} +Provides: erlang-pman = %{version}-%{release} +Provides: erlang-runtime_tools = %{version}-%{release} +Provides: erlang-sasl = %{version}-%{release} +Provides: erlang-snmp = %{version}-%{release} +Provides: erlang-ssh = %{version}-%{release} +Provides: erlang-ssl = %{version}-%{release} +Provides: erlang-stdlib = %{version}-%{release} +Provides: erlang-syntax_tools = %{version}-%{release} +Provides: erlang-toolbar = %{version}-%{release} +Provides: erlang-tools = %{version}-%{release} +Provides: erlang-tv = %{version}-%{release} +Provides: erlang-webtool = %{version}-%{release} +Provides: erlang-xmerl = %{version}-%{release} Requires: tk %description @@ -58,6 +101,7 @@ Documentation for Erlang. %build +# cannot be built with %%configure macros ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} chmod -R u+w . make @@ -112,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 7 2010 Peter Lemenkov - R11B-2.5 +- Added virtual provides for erlang modules + * Mon Apr 19 2010 Peter Lemenkov - R11B-2.4 - Patches rebased - Added patches 6,7 from trunk -- cgit From 83e070415fdb0e7ffb1cace68b02d32fb5431859 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 7 Jun 2010 08:32:29 +0000 Subject: Added missing virtual provides - erlang-erts --- erlang.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index acc2086..42f5100 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,6 +1,6 @@ Name: erlang Version: R11B -Release: 2.5%{?dist} +Release: 2.6%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -41,6 +41,7 @@ Provides: erlang-crypto = %{version}-%{release} Provides: erlang-debugger = %{version}-%{release} Provides: erlang-dialyzer = %{version}-%{release} Provides: erlang-edoc = %{version}-%{release} +Provides: erlang-erts = %{version}-%{release} Provides: erlang-et = %{version}-%{release} Provides: erlang-gs = %{version}-%{release} Provides: erlang-hipe = %{version}-%{release} @@ -156,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 7 2010 Peter Lemenkov - R11B-2.6 +- Added missing virtual provides erlang-erts + * Mon Jun 7 2010 Peter Lemenkov - R11B-2.5 - Added virtual provides for erlang modules -- cgit From 8efdd110291a7565038d0c6b2f50055eac470f48 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 7 Jun 2010 08:32:29 +0000 Subject: Added missing virtual provides - erlang-erts --- erlang.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index e249fb6..fb2ec6a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.9%{?dist} +Release: %{rel}.10%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -54,6 +54,7 @@ Provides: erlang-debugger = %{version}-%{release} Provides: erlang-dialyzer = %{version}-%{release} Provides: erlang-docbuilder = %{version}-%{release} Provides: erlang-edoc = %{version}-%{release} +Provides: erlang-erts = %{version}-%{release} Provides: erlang-et = %{version}-%{release} Provides: erlang-eunit = %{version}-%{release} Provides: erlang-gs = %{version}-%{release} @@ -186,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 7 2010 Peter Lemenkov - R12B-5.10 +- Added missing virtual provides erlang-erts + * Tue May 25 2010 Peter Lemenkov - R12B-5.9 - Use java-1.4.2 only for EL-[45] - Added virtual provides for each erlang module -- cgit From 3c4f7bfef17c18c1daf45a8a491be32e2f533e03 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:54:01 +0000 Subject: dist-git conversion --- .cvsignore | 3 --- .gitignore | 3 +++ Makefile | 21 --------------------- branch | 1 - 4 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 4c8a7ee..0000000 --- a/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -otp_src_R12B-4.tar.gz -otp_doc_html_R12B-4.tar.gz -otp_doc_man_R12B-4.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c8a7ee --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +otp_src_R12B-4.tar.gz +otp_doc_html_R12B-4.tar.gz +otp_doc_man_R12B-4.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index ef337d1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: erlang -# $Id$ -NAME := erlang -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8 -- cgit From 465a13cdec67c7bfef063d3e17be22f22b074498 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:54:03 +0000 Subject: dist-git conversion --- .cvsignore | 3 --- .gitignore | 3 +++ Makefile | 21 --------------------- branch | 1 - 4 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 750bfae..0000000 --- a/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -otp_src_R12B-1.tar.gz -otp_doc_man_R12B-1.tar.gz -otp_doc_html_R12B-1.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..750bfae --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +otp_src_R12B-1.tar.gz +otp_doc_man_R12B-1.tar.gz +otp_doc_html_R12B-1.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index ef337d1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: erlang -# $Id$ -NAME := erlang -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7 -- cgit From 8fe99fefe29186347437a7a74b3681a52e5b0101 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:54:06 +0000 Subject: dist-git conversion --- .cvsignore | 1 - .gitignore | 1 + Makefile | 21 --------------------- branch | 1 - import.log | 9 --------- 5 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index ae1a587..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -otp_src_R13B04.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ae1a587 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +otp_src_R13B04.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index ef337d1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: erlang -# $Id$ -NAME := erlang -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 diff --git a/import.log b/import.log deleted file mode 100644 index 3b1de7e..0000000 --- a/import.log +++ /dev/null @@ -1,9 +0,0 @@ -erlang-R13B-04_1_fc12:F-13:erlang-R13B-04.1.fc12.src.rpm:1268646179 -erlang-R13B-04_2_fc12:F-13:erlang-R13B-04.2.fc12.src.rpm:1269608961 -erlang-R13B-04_3_fc12:F-13:erlang-R13B-04.3.fc12.src.rpm:1271239209 -erlang-R13B-04_4_fc12:F-13:erlang-R13B-04.4.fc12.src.rpm:1271523813 -erlang-R13B-04_5_fc12:F-13:erlang-R13B-04.5.fc12.src.rpm:1272271184 -erlang-R13B-04_6_fc12:F-13:erlang-R13B-04.6.fc12.src.rpm:1272303676 -erlang-R13B-04_9_fc12:F-13:erlang-R13B-04.9.fc12.src.rpm:1272528169 -erlang-R13B-04_11_fc12:F-13:erlang-R13B-04.11.fc12.src.rpm:1273841704 -erlang-R13B-04_12_fc12:F-13:erlang-R13B-04.12.fc12.src.rpm:1274105816 -- cgit From 0f25824a0222a9d8901d7960f23e09d1cba99698 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:54:08 +0000 Subject: dist-git conversion --- .cvsignore | 3 --- .gitignore | 3 +++ Makefile | 21 --------------------- branch | 1 - import.log | 2 -- 5 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 8b4c8b7..0000000 --- a/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -otp_doc_html_R11B-2.tar.gz -otp_doc_man_R11B-2.tar.gz -otp_src_R11B-2.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8b4c8b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +otp_doc_html_R11B-2.tar.gz +otp_doc_man_R11B-2.tar.gz +otp_src_R11B-2.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index bf21c95..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: erlang -# $Id: Makefile,v 1.1 2005/09/06 14:34:13 gemi Exp $ -NAME := erlang -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 6ec5cef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-4 diff --git a/import.log b/import.log deleted file mode 100644 index e57bb33..0000000 --- a/import.log +++ /dev/null @@ -1,2 +0,0 @@ -erlang-R12B-3_2_fc9:EL-4:erlang-R12B-3.2.fc9.src.rpm:1218402209 -erlang-R11B-2_4_fc12:EL-4:erlang-R11B-2.4.fc12.src.rpm:1271749937 -- cgit From dccfed747cb0f0425dc4ec0f044f1021589401cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:54:11 +0000 Subject: dist-git conversion --- .cvsignore | 1 - .gitignore | 1 + Makefile | 21 --------------------- branch | 1 - import.log | 9 --------- 5 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index ae1a587..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -otp_src_R13B04.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ae1a587 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +otp_src_R13B04.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index ef337d1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: erlang -# $Id$ -NAME := erlang -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index ab393de..0000000 --- a/import.log +++ /dev/null @@ -1,9 +0,0 @@ -erlang-R13B-04_1_fc12:F-12:erlang-R13B-04.1.fc12.src.rpm:1268837646 -erlang-R13B-04_2_fc12:F-12:erlang-R13B-04.2.fc12.src.rpm:1269609314 -erlang-R13B-04_3_fc12:F-12:erlang-R13B-04.3.fc12.src.rpm:1271239367 -erlang-R13B-04_4_fc12:F-12:erlang-R13B-04.4.fc12.src.rpm:1271523892 -erlang-R13B-04_5_fc12:F-12:erlang-R13B-04.5.fc12.src.rpm:1272271343 -erlang-R13B-04_6_fc12:F-12:erlang-R13B-04.6.fc12.src.rpm:1272303739 -erlang-R13B-04_9_fc12:F-12:erlang-R13B-04.9.fc12.src.rpm:1272528494 -erlang-R13B-04_11_fc12:F-12:erlang-R13B-04.11.fc12.src.rpm:1273841768 -erlang-R13B-04_12_fc12:F-12:erlang-R13B-04.12.fc12.src.rpm:1274105878 -- cgit From 4d7f70735f91e0e3e77919a4433193fe5f31db3b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:54:14 +0000 Subject: dist-git conversion --- .cvsignore | 3 --- .gitignore | 3 +++ Makefile | 21 --------------------- branch | 1 - 4 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index d16b9d5..0000000 --- a/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -otp_src_R12B-5.tar.gz -otp_doc_html_R12B-5.tar.gz -otp_doc_man_R12B-5.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d16b9d5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +otp_src_R12B-5.tar.gz +otp_doc_html_R12B-5.tar.gz +otp_doc_man_R12B-5.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index ef337d1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: erlang -# $Id$ -NAME := erlang -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10 -- cgit From a826b2ddcf5db522b5a129c2b1107860d1e25297 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:54:15 +0000 Subject: dist-git conversion --- .cvsignore | 3 --- .gitignore | 3 +++ Makefile | 21 --------------------- branch | 1 - import.log | 4 ---- 5 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 34a6285..0000000 --- a/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -otp_doc_html_R12B-5.tar.gz -otp_doc_man_R12B-5.tar.gz -otp_src_R12B-5.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..34a6285 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +otp_doc_html_R12B-5.tar.gz +otp_doc_man_R12B-5.tar.gz +otp_src_R12B-5.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index bf21c95..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: erlang -# $Id: Makefile,v 1.1 2005/09/06 14:34:13 gemi Exp $ -NAME := erlang -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 diff --git a/import.log b/import.log deleted file mode 100644 index 3a20c19..0000000 --- a/import.log +++ /dev/null @@ -1,4 +0,0 @@ -erlang-R12B-3_2_fc9:EL-5:erlang-R12B-3.2.fc9.src.rpm:1218402033 -erlang-R12B-5_6_fc10:EL-5:erlang-R12B-5.6.fc10.src.rpm:1240063042 -erlang-R12B-5_6_fc10_1:EL-5:erlang-R12B-5.6.fc10.1.src.rpm:1241692887 -erlang-R12B-5_8_fc12:EL-5:erlang-R12B-5.8.fc12.src.rpm:1271675150 -- cgit From 9be12b143a2e7445fb502c580cf0a8722e7fa165 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:54:21 +0000 Subject: dist-git conversion --- .cvsignore | 3 --- .gitignore | 3 +++ Makefile | 21 --------------------- branch | 1 - 4 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index d16b9d5..0000000 --- a/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -otp_src_R12B-5.tar.gz -otp_doc_html_R12B-5.tar.gz -otp_doc_man_R12B-5.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d16b9d5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +otp_src_R12B-5.tar.gz +otp_doc_html_R12B-5.tar.gz +otp_doc_man_R12B-5.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index ef337d1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: erlang -# $Id$ -NAME := erlang -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9 -- cgit From 28006379a248ccabe4b0d7940821f76bb88c2a67 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:54:27 +0000 Subject: dist-git conversion --- .cvsignore | 1 - .gitignore | 1 + Makefile | 21 --------------------- branch | 1 - import.log | 10 ---------- 5 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index ae1a587..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -otp_src_R13B04.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ae1a587 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +otp_src_R13B04.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index ef337d1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: erlang -# $Id$ -NAME := erlang -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 diff --git a/import.log b/import.log deleted file mode 100644 index ce48027..0000000 --- a/import.log +++ /dev/null @@ -1,10 +0,0 @@ -erlang-R13B-04_1_fc12:F-12:erlang-R13B-04.1.fc12.src.rpm:1268837646 -erlang-R13B-04_2_fc12:F-12:erlang-R13B-04.2.fc12.src.rpm:1269609314 -erlang-R13B-04_3_fc12:F-12:erlang-R13B-04.3.fc12.src.rpm:1271239367 -erlang-R13B-04_4_fc12:F-12:erlang-R13B-04.4.fc12.src.rpm:1271523892 -erlang-R13B-04_5_fc12:F-12:erlang-R13B-04.5.fc12.src.rpm:1272271343 -erlang-R13B-04_6_fc12:F-12:erlang-R13B-04.6.fc12.src.rpm:1272303739 -erlang-R13B-04_9_fc12:F-12:erlang-R13B-04.9.fc12.src.rpm:1272528494 -erlang-R13B-04_11_fc12:EL-6:erlang-R13B-04.11.fc12.src.rpm:1273841835 -erlang-R13B-04_11_fc12_3:EL-6:erlang-R13B-04.11.fc12.3.src.rpm:1273892386 -erlang-R13B-04_12_fc12:EL-6:erlang-R13B-04.12.fc12.src.rpm:1273901178 -- cgit From 98e538fed97205e33939bc1a4a23abc9569a76a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:54:30 +0000 Subject: dist-git conversion --- .cvsignore | 3 --- .gitignore | 3 +++ Makefile | 21 --------------------- branch | 1 - import.log | 1 - 5 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 34a6285..0000000 --- a/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -otp_doc_html_R12B-5.tar.gz -otp_doc_man_R12B-5.tar.gz -otp_src_R12B-5.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..34a6285 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +otp_doc_html_R12B-5.tar.gz +otp_doc_man_R12B-5.tar.gz +otp_src_R12B-5.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index bf21c95..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: erlang -# $Id: Makefile,v 1.1 2005/09/06 14:34:13 gemi Exp $ -NAME := erlang -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 diff --git a/import.log b/import.log deleted file mode 100644 index 37d6628..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -erlang-R12B-5_8_fc12:F-11:erlang-R12B-5.8.fc12.src.rpm:1271674987 -- cgit From 0ed2dfe6e525a15798d664f64ebfbe9742e4bd01 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:54:31 +0000 Subject: dist-git conversion --- .cvsignore | 3 --- .gitignore | 3 +++ Makefile | 21 --------------------- branch | 1 - 4 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 013e93f..0000000 --- a/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -otp_src_R11B-2.tar.gz -otp_doc_html_R11B-2.tar.gz -otp_doc_man_R11B-2.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..013e93f --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +otp_src_R11B-2.tar.gz +otp_doc_html_R11B-2.tar.gz +otp_doc_man_R11B-2.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index ef337d1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: erlang -# $Id$ -NAME := erlang -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6 -- cgit From 0d872c31315f599831d81ac8a90e348c761a344b Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Thu, 29 Jul 2010 23:07:33 +0200 Subject: Fix accidental macro usage in %%changelog. --- erlang.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index a29647a..f6d548f 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.12%{?dist} +Release: %{rel}.13%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -1968,6 +1968,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 29 2010 Hans Ulrich Niedermann - R13B-04.13 +- Spec file cleanups: + - Fix accidental macro usage in %%changelog. + * Sat May 15 2010 Peter Lemenkov - R13B-04.12 - Moved dialyzer and typer executables from erts to appropriate rpms @@ -2047,7 +2051,7 @@ rm -rf $RPM_BUILD_ROOT * Sun Mar 1 2009 Gerard Milmeister - R12B-5.6 - new release R12B-5 -- link escript and dialyzer to %{_bindir} +- link escript and dialyzer to %%{_bindir} * Tue Feb 24 2009 Fedora Release Engineering - R12B-5.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -- cgit From b5715cf49eb013a38e59873cc0056fd9d909e02a Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Thu, 29 Jul 2010 23:09:27 +0200 Subject: Avoid accidental %%rel increments by rpmdev-bumpspec --- erlang.spec | 54 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/erlang.spec b/erlang.spec index f6d548f..5a6840c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,15 +1,18 @@ -%define ver R13B -%define rel 04 +%global upstream_ver R13B +# Do NOT change %%{upstream_rel} unless UPSTREAM has actually changed it! +%global upstream_rel 04 + +%global n_uvr %{name}-%{upstream_ver}-%{upstream_rel} Name: erlang -Version: %{ver} -Release: %{rel}.13%{?dist} +Version: %{upstream_ver} +Release: %{upstream_rel}.13%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: ERPL URL: http://www.erlang.org -Source0: http://www.erlang.org/download/otp_src_%{ver}%{rel}.tar.gz +Source0: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}.tar.gz Source3: erlang-find-provides.escript Source4: erlang-find-provides.sh Source5: erlang-find-requires.escript @@ -855,7 +858,7 @@ Obsoletes: %{name} < R13B-04.5 Provides support for XML 1.0. %prep -%setup -q -n otp_src_%{ver}%{rel} +%setup -q -n otp_src_%{upstream_ver}%{upstream_rel} %patch1 -p1 -b .do_not_format_manpages %patch2 -p1 -b .rpath %patch4 -p1 -b .fix_shared_lib_install @@ -891,18 +894,18 @@ chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/Makefile chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/src/Makefile # Relocate doc-files into the proper directory -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib +mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{n_uvr}/lib pushd . cd $RPM_BUILD_ROOT%{_libdir}/erlang -mv -v doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} -for i in erts-* ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/$i ; done +mv -v doc $RPM_BUILD_ROOT%{_docdir}/%{n_uvr} +for i in erts-* ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{n_uvr}/$i ; done cd $RPM_BUILD_ROOT%{_libdir}/erlang/lib -for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib/$i || true ; done +for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{n_uvr}/lib/$i || true ; done popd -cp -av AUTHORS EPLICENCE README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} -mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} -mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} -mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +cp -av AUTHORS EPLICENCE README.md $RPM_BUILD_ROOT%{_docdir}/%{n_uvr} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{n_uvr} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/README $RPM_BUILD_ROOT%{_docdir}/%{n_uvr} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{n_uvr} # Win32-specific functionality rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/observer-*/priv/bin/etop.bat @@ -971,13 +974,13 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%dir %{_docdir}/%{name}-%{ver}-%{rel}/ -%doc %{_docdir}/%{name}-%{ver}-%{rel}/AUTHORS -%doc %{_docdir}/%{name}-%{ver}-%{rel}/COPYRIGHT -%doc %{_docdir}/%{name}-%{ver}-%{rel}/EPLICENCE -%doc %{_docdir}/%{name}-%{ver}-%{rel}/PR.template -%doc %{_docdir}/%{name}-%{ver}-%{rel}/README -%doc %{_docdir}/%{name}-%{ver}-%{rel}/README.md +%dir %{_docdir}/%{n_uvr}/ +%doc %{_docdir}/%{n_uvr}/AUTHORS +%doc %{_docdir}/%{n_uvr}/COPYRIGHT +%doc %{_docdir}/%{n_uvr}/EPLICENCE +%doc %{_docdir}/%{n_uvr}/PR.template +%doc %{_docdir}/%{n_uvr}/README +%doc %{_docdir}/%{n_uvr}/README.md %files appmon %defattr(-,root,root) @@ -1132,9 +1135,9 @@ rm -rf $RPM_BUILD_ROOT %files doc %defattr(-,root,root) -%doc %{_docdir}/%{name}-%{ver}-%{rel}/doc -%doc %{_docdir}/%{name}-%{ver}-%{rel}/erts-*/ -%doc %{_docdir}/%{name}-%{ver}-%{rel}/lib/ +%doc %{_docdir}/%{n_uvr}/doc +%doc %{_docdir}/%{n_uvr}/erts-*/ +%doc %{_docdir}/%{n_uvr}/lib/ %files docbuilder @@ -1970,6 +1973,9 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Jul 29 2010 Hans Ulrich Niedermann - R13B-04.13 - Spec file cleanups: + - Avoid accidental %%rel increments by rpmdev-bumpspec. + - Use %%global for our spec file macros. + - Use macro for redundant directory names. - Fix accidental macro usage in %%changelog. * Sat May 15 2010 Peter Lemenkov - R13B-04.12 -- cgit From c72743841c384eca8912515c386680c8edd5dc70 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Thu, 29 Jul 2010 23:09:43 +0200 Subject: Whitespace cleanups (tabs vs. spaces). --- erlang.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 5a6840c..5c67c48 100644 --- a/erlang.spec +++ b/erlang.spec @@ -409,7 +409,7 @@ Requires: %{name}-kernel = %{version}-%{release} Requires: %{name}-stdlib = %{version}-%{release} BuildRequires: tcl-devel BuildRequires: tk-devel -Requires: tk +Requires: tk Obsoletes: %{name} < R13B-04.5 %description gs @@ -536,7 +536,7 @@ Requires: %{name}-erts = %{version}-%{release} Requires: %{name}-kernel = %{version}-%{release} Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 -BuildRequires: unixODBC-devel +BuildRequires: unixODBC-devel %description odbc An interface to relational SQL-databases built on ODBC (Open Database @@ -841,7 +841,7 @@ Requires: %{name}-stdlib = %{version}-%{release} Requires: mesa-libGL Requires: mesa-libGLU Obsoletes: %{name} < R13B-04.5 -BuildRequires: wxGTK-devel +BuildRequires: wxGTK-devel %description wx A Graphics System used to write platform independent user interfaces. @@ -1976,6 +1976,7 @@ rm -rf $RPM_BUILD_ROOT - Avoid accidental %%rel increments by rpmdev-bumpspec. - Use %%global for our spec file macros. - Use macro for redundant directory names. + - Whitespace cleanups (tabs vs. spaces). - Fix accidental macro usage in %%changelog. * Sat May 15 2010 Peter Lemenkov - R13B-04.12 -- cgit From 4faf855ffa95717c3e0c264ccf181b6e9f4dbbba Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Fri, 30 Jul 2010 00:15:14 +0200 Subject: Properly hook up (X)Emacs erlang-mode (#491165) Note: The %{_xemacs_version} etc. rpm macros are available starting with F-12. --- erlang.spec | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/erlang.spec b/erlang.spec index 5c67c48..a5d47cc 100644 --- a/erlang.spec +++ b/erlang.spec @@ -44,6 +44,11 @@ BuildRequires: libxslt # Required for building docs (escript) BuildRequires: erlang +BuildRequires: emacs +BuildRequires: xemacs +BuildRequires: emacs-el +BuildRequires: xemacs-packages-extra-el + Requires: erlang-appmon = %{version}-%{release} Requires: erlang-asn1 = %{version}-%{release} Requires: erlang-common_test = %{version}-%{release} @@ -787,6 +792,7 @@ Requires: %{name}-runtime_tools = %{version}-%{release} Requires: %{name}-stdlib = %{version}-%{release} Requires: %{name}-webtool = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 +Provides: emacs-common-erlang = %{version}-%{release} %description tools A set of programming tools including a coverage analyzer etc. @@ -857,6 +863,44 @@ Obsoletes: %{name} < R13B-04.5 %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 +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 +Requires: xemacs-erlang = %{version}-%{release} +Group: Applications/Editors +BuildArch: noarch + +%description -n xemacs-erlang-el +Erlang mode for XEmacs (source lisp files). + %prep %setup -q -n otp_src_%{upstream_ver}%{upstream_rel} %patch1 -p1 -b .do_not_format_manpages @@ -875,12 +919,68 @@ CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enabl %else CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib %endif + +# GNU Emacs/XEmacs related stuff +erlang_tools_vsn="$(sed -n 's/TOOLS_VSN = //p' lib/tools/vsn.mk)" + +# GNU Emacs related stuff +cat > emacs-erlang-init.el << EOF +(setq load-path (cons "%{_emacs_sitelispdir}/erlang" load-path)) +(setq erlang-root-dir "%{_libdir}/erlang") +(setq exec-path (cons "%{_libdir}/erlang/bin" exec-path)) +(require 'erlang-start) +EOF +mkdir emacs-erlang +cp lib/tools/emacs/*.el emacs-erlang/ +pushd emacs-erlang +%{_emacs_bytecompile} *.el +popd + +# XEmacs related stuff +cat > xemacs-erlang-init.el << EOF +(setq load-path (cons "%{_xemacs_sitelispdir}/erlang" load-path)) +(setq erlang-root-dir "%{_libdir}/erlang") +(setq exec-path (cons "%{_libdir}/erlang/bin" exec-path)) +(require 'erlang-start) +EOF +mkdir xemacs-erlang +cp lib/tools/emacs/*.el xemacs-erlang/ +pushd xemacs-erlang +%{_xemacs_bytecompile} *.el +popd + make make docs %install rm -rf $RPM_BUILD_ROOT + +# GNU Emacs/XEmacs related stuff +erlang_tools_vsn="$(sed -n 's/TOOLS_VSN = //p' lib/tools/vsn.mk)" + +# GNU Emacs related stuff +install -m 0755 -d "$RPM_BUILD_ROOT%{_emacs_sitestartdir}" +install -m 0755 -d "$RPM_BUILD_ROOT%{_emacs_sitelispdir}/erlang" +install -m 0644 emacs-erlang-init.el "$RPM_BUILD_ROOT%{_emacs_sitestartdir}/erlang-init.el" +for f in lib/tools/emacs/{README,*.el}; do + b="$(basename "$f")"; + ln -s "%{_libdir}/erlang/lib/tools-${erlang_tools_vsn}/emacs/$b" \ + "$RPM_BUILD_ROOT%{_emacs_sitelispdir}/erlang/" +done +install -m 0644 emacs-erlang/*.elc "$RPM_BUILD_ROOT%{_emacs_sitelispdir}/erlang/" + +# XEmacs related stuff +install -m 0755 -d "$RPM_BUILD_ROOT%{_xemacs_sitestartdir}" +install -m 0755 -d "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang" +install -m 0644 xemacs-erlang-init.el "$RPM_BUILD_ROOT%{_xemacs_sitestartdir}/erlang-init.el" +for f in lib/tools/emacs/{README,*.el}; do + b="$(basename "$f")"; + ln -s "%{_libdir}/erlang/lib/tools-${erlang_tools_vsn}/emacs/$b" \ + "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang/" +done +install -m 0644 xemacs-erlang/*.elc "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang/" + make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install-docs @@ -1969,6 +2069,28 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/xmerl_xs.* %{_libdir}/erlang/man/man3/xmerl_xsd.* +%files -n emacs-erlang +%defattr(-,root,root,-) +%dir %{_emacs_sitelispdir}/erlang +%doc %{_emacs_sitelispdir}/erlang/README +%{_emacs_sitelispdir}/erlang/*.elc +%{_emacs_sitestartdir}/erlang-init.el + +%files -n emacs-erlang-el +%defattr(-,root,root,-) +%{_emacs_sitelispdir}/erlang/*.el + +%files -n xemacs-erlang +%defattr(-,root,root,-) +%dir %{_xemacs_sitelispdir}/erlang +%doc %{_xemacs_sitelispdir}/erlang/README +%{_xemacs_sitelispdir}/erlang/*.elc +%{_xemacs_sitestartdir}/erlang-init.el + +%files -n xemacs-erlang-el +%defattr(-,root,root,-) +%{_xemacs_sitelispdir}/erlang/*.el + %changelog * Mon Jul 29 2010 Hans Ulrich Niedermann - R13B-04.13 -- cgit