summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.cvsignore6
-rw-r--r--erlang.spec29
-rw-r--r--otp-links.patch20
-rw-r--r--sources6
4 files changed, 29 insertions, 32 deletions
diff --git a/.cvsignore b/.cvsignore
index 96ba076..498df4a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-otp_doc_html_R10B-10.tar.gz
-otp_doc_man_R10B-10.tar.gz
-otp_src_R10B-10.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 1ad9a4c..b932ebd 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -1,19 +1,18 @@
Name: erlang
-Version: R10B
-Release: 10.3%{?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-10.tar.gz
-Source1: http://www.erlang.org/download/otp_doc_html_R10B-10.tar.gz
-Source2: http://www.erlang.org/download/otp_doc_man_R10B-10.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
-Patch4: otp-glibc24.patch
Patch5: otp-run_erl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,13 +42,12 @@ Documentation for Erlang.
%prep
-%setup -q -n otp_src_R10B-10
-%patch -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -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
@@ -103,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu May 18 2006 Gerard Milmeister <gemi@bluewin.ch> - R11B-0.1
+- new version R11B-0
+
* Wed May 3 2006 Gerard Milmeister <gemi@bluewin.ch> - R10B-10.3
- added patch for run_erl by Knut-HÃ¥vard Aksnes
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/sources b/sources
index d4a0498..713b3df 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-d6e9655ff07af642025b0465c5e7e1a6 otp_doc_html_R10B-10.tar.gz
-207e00bcaf5a9428bd86e3973f9b699f otp_doc_man_R10B-10.tar.gz
-c1405c885f07d661b7362b822d571586 otp_src_R10B-10.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