rpms/erlang/FC-3 otp-run_erl.patch, NONE, 1.1 otp-sslrpath.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 erlang.spec, 1.4, 1.5 otp-links.patch, 1.1, 1.2 sources, 1.3, 1.4
Gérard Milmeister (gemi)
fedora-extras-commits at redhat.com
Thu May 18 19:44:42 UTC 2006
Author: gemi
Update of /cvs/extras/rpms/erlang/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13024
Modified Files:
.cvsignore erlang.spec otp-links.patch sources
Added Files:
otp-run_erl.patch otp-sslrpath.patch
Log Message:
new version R11B-0
otp-run_erl.patch:
--- NEW FILE otp-run_erl.patch ---
--- 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 <dirent.h>
#include <termios.h>
#include <time.h>
+#include <pty.h>
+#include <utmp.h>
#if !defined(NO_SYSLOG)
#include <syslog.h>
#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
otp-sslrpath.patch:
--- NEW FILE otp-sslrpath.patch ---
--- 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...
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/erlang/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 29 Oct 2005 22:34:14 -0000 1.3
+++ .cvsignore 18 May 2006 19:44:42 -0000 1.4
@@ -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
Index: erlang.spec
===================================================================
RCS file: /cvs/extras/rpms/erlang/FC-3/erlang.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- erlang.spec 29 Oct 2005 22:34:15 -0000 1.4
+++ erlang.spec 18 May 2006 19:44:42 -0000 1.5
@@ -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 @@
%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 @@
%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 <gemi at bluewin.ch> - R11B-0.1
+- new version R11B-0
+
* Sat Oct 29 2005 Gerard Milmeister <gemi at bluewin.ch> - R10B-8.2
- updated rpath patch
otp-links.patch:
Index: otp-links.patch
===================================================================
RCS file: /cvs/extras/rpms/erlang/FC-3/otp-links.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- otp-links.patch 6 Sep 2005 15:14:36 -0000 1.1
+++ otp-links.patch 18 May 2006 19:44:42 -0000 1.2
@@ -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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/erlang/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 29 Oct 2005 22:34:15 -0000 1.3
+++ sources 18 May 2006 19:44:42 -0000 1.4
@@ -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
More information about the fedora-extras-commits
mailing list