From 864400264ba55995865a60b6848994574466a66a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9rard=20Milmeister?= <gemi@fedoraproject.org>
Date: Sat, 30 Dec 2006 23:46:59 +0000
Subject: [PATCH] new version R11B-2

---
 erlang.spec       |  7 ++++++-
 otp-glibc24.patch | 11 -----------
 otp-glibc25.patch | 11 +++++++++++
 3 files changed, 17 insertions(+), 12 deletions(-)
 delete mode 100644 otp-glibc24.patch
 create mode 100644 otp-glibc25.patch

diff --git a/erlang.spec b/erlang.spec
index 6f0ed52..e76683d 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -1,6 +1,6 @@
 Name:           erlang
 Version:        R11B
-Release:        2.1%{?dist}
+Release:        2.2%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
@@ -13,6 +13,7 @@ Patch0:		otp-links.patch
 Patch1:		otp-install.patch
 Patch2:		otp-rpath.patch
 Patch3:         otp-sslrpath.patch
+Patch4:         otp-glibc25.patch
 Patch5:		otp-run_erl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,6 +49,7 @@ Documentation for Erlang.
 %patch1 -p1 -b .install
 %patch2 -p1 -b .rpath
 %patch3 -p1 -b .sslrpath
+%patch4 -p1 -b .glibc25
 %patch5 -p1 -b .run_erl
 
 
@@ -102,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 30 2006 Gerard Milmeister <gemi@bluewin.ch> - R11B-2.2
+- added patch for compiling with glibc 2.5
+
 * Sat Dec 30 2006 Gerard Milmeister <gemi@bluewin.ch> - R11B-2.1
 - new version R11B-2
 
diff --git a/otp-glibc24.patch b/otp-glibc24.patch
deleted file mode 100644
index 4875e65..0000000
--- a/otp-glibc24.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- otp_src_R10B-10/erts/emulator/hipe/hipe_x86_signal.c.glibc24	2006-03-13 17:16:39.000000000 +0100
-+++ otp_src_R10B-10/erts/emulator/hipe/hipe_x86_signal.c	2006-03-13 17:17:11.000000000 +0100
-@@ -27,7 +27,7 @@
- #include <stdlib.h>
- #include "hipe_signal.h"
- 
--#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 3
-+#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 4
- /* See comment below for glibc 2.2. */
- #ifndef __USE_GNU
- #define __USE_GNU		/* to un-hide RTLD_NEXT */
diff --git a/otp-glibc25.patch b/otp-glibc25.patch
new file mode 100644
index 0000000..b9d849d
--- /dev/null
+++ b/otp-glibc25.patch
@@ -0,0 +1,11 @@
+--- otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c.glibc25	2006-12-30 23:57:04.000000000 +0100
++++ otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c	2006-12-30 23:57:36.000000000 +0100
+@@ -34,7 +34,7 @@
+ #endif
+ #include "hipe_signal.h"
+ 
+-#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4)
++#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4 || __GLIBC_MINOR__ == 5)
+ /* See comment below for glibc 2.2. */
+ #ifndef __USE_GNU
+ #define __USE_GNU		/* to un-hide RTLD_NEXT */