rpms/erlang/devel erlang.spec,1.10,1.11 otp-glibc24.patch,1.2,1.3

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/extras/rpms/erlang/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4385

Modified Files:
	erlang.spec otp-glibc24.patch 
Log Message:



Index: erlang.spec
===================================================================
RCS file: /cvs/extras/rpms/erlang/devel/erlang.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- erlang.spec	13 Mar 2006 15:58:48 -0000	1.10
+++ erlang.spec	13 Mar 2006 16:18:42 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           erlang
 Version:        R10B
-Release:        10.1%{?dist}
+Release:        10.2%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
@@ -13,6 +13,7 @@
 Patch1:		otp-install.patch
 Patch2:		otp-rpath.patch
 Patch3:         otp-sslrpath.patch
+Patch4:		otp-glibc24.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ncurses-devel
@@ -46,6 +47,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 
 %build

otp-glibc24.patch:

Index: otp-glibc24.patch
===================================================================
RCS file: /cvs/extras/rpms/erlang/devel/otp-glibc24.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- otp-glibc24.patch	2 Nov 2005 21:28:29 -0000	1.2
+++ otp-glibc24.patch	13 Mar 2006 16:18:42 -0000	1.3
@@ -1,11 +1,11 @@
---- otp_src_R10B-6/erts/emulator/hipe/hipe_x86_signal.c.glibc24	2005-09-06 22:01:13.000000000 +0200
-+++ otp_src_R10B-6/erts/emulator/hipe/hipe_x86_signal.c	2005-09-06 22:01:36.000000000 +0200
+--- 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__ == 3 || __GLIBC_MINOR__ == 4)
++#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 4
  /* See comment below for glibc 2.2. */
+ #ifndef __USE_GNU
  #define __USE_GNU		/* to un-hide RTLD_NEXT */
- #include <dlfcn.h>