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