summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--erlang.spec12
-rw-r--r--otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch8
-rw-r--r--otp-0002-Remove-rpath.patch8
-rw-r--r--otp-0004-Fix-for-dlopening-libGL-and-libGLU.patch6
-rw-r--r--otp-0005-Do-not-install-C-sources.patch14
-rw-r--r--otp-0006-Do-not-install-Java-sources.patch6
-rw-r--r--otp-0007-Do-not-install-info-files-they-are-almost-empty-and-.patch12
-rw-r--r--otp-0008-Do-not-install-nteventlog-and-related-doc-files-on-n.patch6
-rw-r--r--otp-0009-Do-not-install-.bat-files-on-non-win32-machines.patch6
-rw-r--r--otp-0010-Do-not-install-VxWorks-specific-docs.patch6
-rw-r--r--otp-0011-Do-not-install-erlang-sources.patch14
-rw-r--r--otp-0012-Fix-installation-of-example-file.patch27
-rw-r--r--sources2
14 files changed, 82 insertions, 46 deletions
diff --git a/.gitignore b/.gitignore
index 2c074ea..0c5db81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
otp_src_R14A.tar.gz
+/otp_src_R14B.tar.gz
diff --git a/erlang.spec b/erlang.spec
index 9648be8..ef6ce6f 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -1,4 +1,4 @@
-%global upstream_ver R14A
+%global upstream_ver R14B
# Do NOT change %%{upstream_rel} unless UPSTREAM has actually changed it!
%global upstream_rel 0
@@ -8,7 +8,7 @@
Name: erlang
Version: %{upstream_ver}
-Release: %{upstream_rel}.6%{?dist}
+Release: %{upstream_rel}.1%{?dist}
Summary: General-purpose programming language and runtime environment
Group: Development/Languages
@@ -40,6 +40,8 @@ Patch9: otp-0009-Do-not-install-.bat-files-on-non-win32-machines.patch
Patch10: otp-0010-Do-not-install-VxWorks-specific-docs.patch
# Fedora-specific
Patch11: otp-0011-Do-not-install-erlang-sources.patch
+# Will be proposed for inclusion into upstream
+Patch12: otp-0012-Fix-installation-of-example-file.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel
@@ -922,6 +924,7 @@ Erlang mode for XEmacs (source lisp files).
%patch9 -p1 -b .no_win32_bat_files
%patch10 -p1 -b .no_vxworks_specific
%patch11 -p1 -b .no_erlang_sources
+%patch12 -p1 -b .install_example_file_properly
# remove shipped zlib sources
rm -f erts/emulator/zlib/*.[ch]
@@ -1414,6 +1417,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/erlang/lib/kernel-*/examples
%{_libdir}/erlang/lib/megaco-*/examples
%{_libdir}/erlang/lib/mnesia-*/examples
+%{_libdir}/erlang/lib/observer-*/examples
%{_libdir}/erlang/lib/orber-*/examples
%{_libdir}/erlang/lib/reltool-*/examples
%{_libdir}/erlang/lib/snmp-*/examples
@@ -1780,6 +1784,7 @@ rm -rf $RPM_BUILD_ROOT
%if %{with doc}
%{_libdir}/erlang/man/man3/old_ssl.*
%{_libdir}/erlang/man/man3/ssl.*
+%{_libdir}/erlang/man/man3/ssl_session_cache_api.*
%{_libdir}/erlang/man/man6/ssl.*
%endif
@@ -2189,6 +2194,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Sep 16 2010 Peter Lemenkov <lemenkov@gmail.com> - R14B-0.1
+- R14B release
+
* Mon Aug 2 2010 Hans Ulrich Niedermann <hun@n-dimensional.de> - R14A-0.6
- Implement '--without doc' conditional for faster test builds (#618245).
diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
index 36c5aa7..813f5fb 100644
--- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
+++ b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
@@ -1,7 +1,7 @@
-From c237cca27ecf572c1b4505f2ec979b0c294f37d8 Mon Sep 17 00:00:00 2001
+From 21cd120e8c44f65a53b9aa1ba676df53592c5ec7 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Thu, 25 Feb 2010 16:45:28 +0300
-Subject: [PATCH 01/11] Do not format man-pages and do not install miscellaneous
+Subject: [PATCH 01/12] Do not format man-pages and do not install miscellaneous
utilities for dealing with man-pages.
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
@@ -11,7 +11,7 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
-index 6551b29..de2ca79 100644
+index 9665566..a82627d 100644
--- a/erts/etc/common/Makefile.in
+++ b/erts/etc/common/Makefile.in
@@ -537,10 +537,6 @@ endif
@@ -45,5 +45,5 @@ index 7dead62..e522365 100644
-
exit 0
--
-1.7.0.1
+1.7.2.3
diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch
index b3fb15f..eafe6d3 100644
--- a/otp-0002-Remove-rpath.patch
+++ b/otp-0002-Remove-rpath.patch
@@ -1,7 +1,7 @@
-From b4f00d41b29982a0fb2362b9d63caf78b4c6f83a Mon Sep 17 00:00:00 2001
+From a2e70caa1cf05c1dd8038cda557de60f935d4d6b Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Thu, 25 Feb 2010 16:57:43 +0300
-Subject: [PATCH 02/11] Remove rpath
+Subject: [PATCH 02/12] Remove rpath
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@@ -11,7 +11,7 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
-index e728db1..b797ed7 100644
+index 040adcf..48f931d 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -83,7 +83,7 @@ endif
@@ -68,5 +68,5 @@ index 49a209f..5e6c74e 100644
SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@
--
-1.7.0.1
+1.7.2.3
diff --git a/otp-0004-Fix-for-dlopening-libGL-and-libGLU.patch b/otp-0004-Fix-for-dlopening-libGL-and-libGLU.patch
index c4eed13..c6b9efc 100644
--- a/otp-0004-Fix-for-dlopening-libGL-and-libGLU.patch
+++ b/otp-0004-Fix-for-dlopening-libGL-and-libGLU.patch
@@ -1,7 +1,7 @@
-From 062aaa0c3f0926a8b57173686985bd3aa74e2435 Mon Sep 17 00:00:00 2001
+From 49170da856728f50c5e5eea9a062ee6cf9718cc3 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Fri, 16 Apr 2010 21:13:47 +0400
-Subject: [PATCH 04/11] Fix for dlopening libGL and libGLU
+Subject: [PATCH 04/12] Fix for dlopening libGL and libGLU
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@@ -31,5 +31,5 @@ index 63dd68f..36bf15f 100644
#endif
// fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName);
--
-1.7.0.1
+1.7.2.3
diff --git a/otp-0005-Do-not-install-C-sources.patch b/otp-0005-Do-not-install-C-sources.patch
index 8e71d09..8358c47 100644
--- a/otp-0005-Do-not-install-C-sources.patch
+++ b/otp-0005-Do-not-install-C-sources.patch
@@ -1,7 +1,7 @@
-From 61a98426e5fdb296b349675a7e0851f515d7df73 Mon Sep 17 00:00:00 2001
+From 307ed0abc8e61a3b7b6af2e979b3a83d8ff81cce Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Fri, 18 Jun 2010 23:41:33 +0400
-Subject: [PATCH 05/11] Do not install C sources
+Subject: [PATCH 05/12] Do not install C sources
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@@ -30,10 +30,10 @@ index 9e9cb18..1d73d3c 100644
release_docs_spec:
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
-index b797ed7..35ff433 100644
+index 48f931d..4a7a183 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
-@@ -126,10 +126,7 @@ docs:
+@@ -136,10 +136,7 @@ docs:
include $(ERL_TOP)/make/otp_release_targets.mk
release_spec: opt
@@ -155,10 +155,10 @@ index 5e6c74e..bf4843b 100644
release_docs_spec:
diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
-index e6b76e2..86da1b7 100644
+index 65a7f5f..144c1ba 100644
--- a/lib/tools/c_src/Makefile.in
+++ b/lib/tools/c_src/Makefile.in
-@@ -189,8 +189,6 @@ include ../vsn.mk
+@@ -190,8 +190,6 @@ include ../vsn.mk
RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN)
release_spec: all
@@ -168,5 +168,5 @@ index e6b76e2..86da1b7 100644
$(INSTALL_DIR) $(RELSYSDIR)/bin
$(INSTALL_PROGRAM) $(PROGS) $(RELSYSDIR)/bin
--
-1.7.0.1
+1.7.2.3
diff --git a/otp-0006-Do-not-install-Java-sources.patch b/otp-0006-Do-not-install-Java-sources.patch
index 7994118..a69b19b 100644
--- a/otp-0006-Do-not-install-Java-sources.patch
+++ b/otp-0006-Do-not-install-Java-sources.patch
@@ -1,7 +1,7 @@
-From 1e7fb0a24915e4b0de46e613fb4e308af56a22e7 Mon Sep 17 00:00:00 2001
+From b893fff74eef26267652f2e58136ce31c508d1ad Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 19 Jun 2010 09:25:18 +0400
-Subject: [PATCH 06/11] Do not install Java sources
+Subject: [PATCH 06/12] Do not install Java sources
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@@ -36,5 +36,5 @@ index d0ff9cd..9990d2b 100644
$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) $(RELSYSDIR)/priv
--
-1.7.0.1
+1.7.2.3
diff --git a/otp-0007-Do-not-install-info-files-they-are-almost-empty-and-.patch b/otp-0007-Do-not-install-info-files-they-are-almost-empty-and-.patch
index b50bbb2..0ad6ff6 100644
--- a/otp-0007-Do-not-install-info-files-they-are-almost-empty-and-.patch
+++ b/otp-0007-Do-not-install-info-files-they-are-almost-empty-and-.patch
@@ -1,7 +1,7 @@
-From 7741f154a2200d1d437991aa4148a99d6ba62f57 Mon Sep 17 00:00:00 2001
+From 71b4e3a73fff283fcf97bfd2f570a5b071a7ae40 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 19 Jun 2010 09:29:12 +0400
-Subject: [PATCH 07/11] Do not install info files - they are almost empty and useless
+Subject: [PATCH 07/12] Do not install info files - they are almost empty and useless
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@@ -1638,10 +1638,10 @@ index 41a2a2c..0000000
-short: Secure Shell application with sftp and ssh support
\ No newline at end of file
diff --git a/lib/ssl/doc/src/Makefile b/lib/ssl/doc/src/Makefile
-index d6788c1..acd4a89 100644
+index 3119d37..b092eeb 100644
--- a/lib/ssl/doc/src/Makefile
+++ b/lib/ssl/doc/src/Makefile
-@@ -66,7 +66,6 @@ XML_FLAGS += -defs cite cite.defs -booksty otpA4
+@@ -64,7 +64,6 @@ XML_FLAGS += -defs cite cite.defs -booksty otpA4
HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
@@ -1649,7 +1649,7 @@ index d6788c1..acd4a89 100644
EXTRA_FILES = \
$(DEFAULT_GIF_FILES) \
$(DEFAULT_HTML_FILES) \
-@@ -124,7 +123,6 @@ release_docs_spec: docs
+@@ -122,7 +121,6 @@ release_docs_spec: docs
$(INSTALL_DIR) $(RELSYSDIR)/doc/html
$(INSTALL_DATA) $(HTMLDIR)/* \
$(RELSYSDIR)/doc/html
@@ -1955,5 +1955,5 @@ index 81d16ab..0000000
-group: comm
-short: Provides support for XML 1.0
--
-1.7.0.1
+1.7.2.3
diff --git a/otp-0008-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/otp-0008-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
index d056cfa..ad1a745 100644
--- a/otp-0008-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
+++ b/otp-0008-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
@@ -1,7 +1,7 @@
-From d44bca67743373ff6c4446f62cb7e54a14f150d5 Mon Sep 17 00:00:00 2001
+From 552623edb7fd3124d0a0e82304b744d77eddc69b Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 19 Jun 2010 09:59:39 +0400
-Subject: [PATCH 08/11] Do not install nteventlog and related doc-files on non-win32 systems
+Subject: [PATCH 08/12] Do not install nteventlog and related doc-files on non-win32 systems
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@@ -64,5 +64,5 @@ index 9a75446..a492a63 100644
$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
sed -e 's;%VSN%;$(VSN);' $< > $@
--
-1.7.0.1
+1.7.2.3
diff --git a/otp-0009-Do-not-install-.bat-files-on-non-win32-machines.patch b/otp-0009-Do-not-install-.bat-files-on-non-win32-machines.patch
index ee6a4b2..262f61d 100644
--- a/otp-0009-Do-not-install-.bat-files-on-non-win32-machines.patch
+++ b/otp-0009-Do-not-install-.bat-files-on-non-win32-machines.patch
@@ -1,7 +1,7 @@
-From 93181c4ef2ddac536849c1abb36ab4a2dd16efba Mon Sep 17 00:00:00 2001
+From 5d52142fcfa2b4a776f80592ae0033e17628adb7 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 19 Jun 2010 10:25:29 +0400
-Subject: [PATCH 09/11] Do not install *.bat files on non-win32 machines
+Subject: [PATCH 09/12] Do not install *.bat files on non-win32 machines
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@@ -51,5 +51,5 @@ index 56ab772..c29e912 100644
# ----------------------------------------------------
# FLAGS
--
-1.7.0.1
+1.7.2.3
diff --git a/otp-0010-Do-not-install-VxWorks-specific-docs.patch b/otp-0010-Do-not-install-VxWorks-specific-docs.patch
index bddcf6a..96540e6 100644
--- a/otp-0010-Do-not-install-VxWorks-specific-docs.patch
+++ b/otp-0010-Do-not-install-VxWorks-specific-docs.patch
@@ -1,7 +1,7 @@
-From eb99892461faffaaa9156eeb78fa905175de4a79 Mon Sep 17 00:00:00 2001
+From 659867f485cea9959b7641bd0f83d290759a7170 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 19 Jun 2010 11:26:04 +0400
-Subject: [PATCH 10/11] Do not install VxWorks-specific docs
+Subject: [PATCH 10/12] Do not install VxWorks-specific docs
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@@ -21,5 +21,5 @@ index be99288..4bb07c4 100644
erl_prim_loader.xml \
erlang.xml \
--
-1.7.0.1
+1.7.2.3
diff --git a/otp-0011-Do-not-install-erlang-sources.patch b/otp-0011-Do-not-install-erlang-sources.patch
index cfae1a6..51cfc06 100644
--- a/otp-0011-Do-not-install-erlang-sources.patch
+++ b/otp-0011-Do-not-install-erlang-sources.patch
@@ -1,7 +1,7 @@
-From 2eabfcf4bbbf8d809c2c58926634ba3f0a8200ab Mon Sep 17 00:00:00 2001
+From dcf186ea937a12d3aa28adc2431774bc56b43335 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 19 Jun 2010 13:21:10 +0400
-Subject: [PATCH 11/11] Do not install erlang sources
+Subject: [PATCH 11/12] Do not install erlang sources
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@@ -784,10 +784,10 @@ index e573e57..bdbced1 100644
$(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) $(RELSYSDIR)/ebin
diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile
-index c30399f..36a5020 100644
+index 51f4053..6179e0a 100644
--- a/lib/public_key/src/Makefile
+++ b/lib/public_key/src/Makefile
-@@ -47,8 +47,6 @@ MODULES = \
+@@ -46,8 +46,6 @@ MODULES = \
HRL_FILES = $(INCLUDE)/public_key.hrl
@@ -796,7 +796,7 @@ index c30399f..36a5020 100644
ERL_FILES = $(MODULES:%=%.erl)
TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
-@@ -101,8 +99,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+@@ -100,8 +98,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
include $(ERL_TOP)/make/otp_release_targets.mk
release_spec: opt
@@ -960,7 +960,7 @@ index 50369e6..12c6db4 100644
release_docs_spec:
diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile
-index d55a3a5..9b03f8f 100644
+index 3dca551..217129b 100644
--- a/lib/test_server/src/Makefile
+++ b/lib/test_server/src/Makefile
@@ -125,7 +125,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
@@ -1068,5 +1068,5 @@ index 7009b50..c9c7303 100644
$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
--
-1.7.0.1
+1.7.2.3
diff --git a/otp-0012-Fix-installation-of-example-file.patch b/otp-0012-Fix-installation-of-example-file.patch
new file mode 100644
index 0000000..3df5b2c
--- /dev/null
+++ b/otp-0012-Fix-installation-of-example-file.patch
@@ -0,0 +1,27 @@
+From ef692abf68c739722e499f9a564eaa510306fdeb Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Thu, 16 Sep 2010 14:43:19 +0400
+Subject: [PATCH 12/12] Fix installation of example file
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+---
+ lib/observer/src/Makefile | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
+index fa5f2d0..c61d157 100644
+--- a/lib/observer/src/Makefile
++++ b/lib/observer/src/Makefile
+@@ -114,7 +114,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DIR) $(RELSYSDIR)/examples
++ $(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/examples
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+--
+1.7.2.3
+
diff --git a/sources b/sources
index 23c50b7..9a057d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a24873bbace9ab3c307f3d2492d9e134 otp_src_R14A.tar.gz
+5292a04556d17ad528d570e02357dfbb otp_src_R14B.tar.gz
generated by cgit (git 2.34.1) at 2024-04-30 10:59:10 +0000