From 3b3f0be0685ff8a494ab874d5b6b2cf9b6945756 Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: May 18 2006 19:44:42 +0000 Subject: new version R11B-0 --- 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