[root] Do the glibc 2.16 patch properly

[Mattias Ellert]

commit 13ab762d36110c994f825c9b1474b97d1c0a5caf
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Thu Jul 5 22:22:04 2012 +0200

    Do the glibc 2.16 patch properly

 root-glibc.patch |   33 ++++++++++++---------------------
 root.spec        |    5 ++++-
 2 files changed, 16 insertions(+), 22 deletions(-)
---
diff --git a/root-glibc.patch b/root-glibc.patch
index 58b9afd..b2da159 100644
--- a/root-glibc.patch
+++ b/root-glibc.patch
@@ -1,39 +1,30 @@
 diff -ur root-5.34.00.orig/build/rmkdepend/main.c root-5.34.00/build/rmkdepend/main.c
 --- root-5.34.00.orig/build/rmkdepend/main.c	2012-06-05 15:31:46.000000000 +0200
-+++ root-5.34.00/build/rmkdepend/main.c	2012-06-10 16:03:57.954057521 +0200
-@@ -52,7 +52,7 @@
- #else
- #include <io.h>
- #endif
--#if !defined(__hpux)
-+#if !defined(__USE_POSIX) && !defined(__hpux)
- # if defined(__APPLE__)
- #  include <AvailabilityMacros.h>
- #  if !defined(MAC_OS_X_VERSION_10_4)
++++ root-5.34.00/build/rmkdepend/main.c	2012-07-05 20:42:58.938953353 +0200
 @@ -60,7 +60,7 @@
  #  endif
  # elif defined(__CYGWIN__)
  extern int fchmod(int, mode_t);
 -#else
-+# else
++# elif !defined(__GLIBC__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 16)
  extern int fchmod(int, int);
  # endif
  #endif
 diff -ur root-5.34.00.orig/cint/tool/rmkdepend/main.c root-5.34.00/cint/tool/rmkdepend/main.c
 --- root-5.34.00.orig/cint/tool/rmkdepend/main.c	2012-06-05 15:31:30.000000000 +0200
-+++ root-5.34.00/cint/tool/rmkdepend/main.c	2012-06-10 16:03:58.327061162 +0200
-@@ -52,7 +52,7 @@
- #else
- #include <io.h>
- #endif
--#if !defined(__hpux)
-+#if !defined(__USE_POSIX) && !defined(__hpux)
- #if defined(__APPLE__)
- #include <AvailabilityMacros.h>
++++ root-5.34.00/cint/tool/rmkdepend/main.c	2012-07-05 20:42:58.492949104 +0200
+@@ -58,7 +58,7 @@
  #if !defined(MAC_OS_X_VERSION_10_4)
+ extern int fchmod();
+ #endif
+-#else
++#elif !defined(__GLIBC__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 16)
+ extern int fchmod();
+ #endif
+ #endif
 diff -ur root-5.34.00.orig/core/unix/src/TUnixSystem.cxx root-5.34.00/core/unix/src/TUnixSystem.cxx
 --- root-5.34.00.orig/core/unix/src/TUnixSystem.cxx	2012-06-05 15:31:17.000000000 +0200
-+++ root-5.34.00/core/unix/src/TUnixSystem.cxx	2012-06-10 15:53:40.483485520 +0200
++++ root-5.34.00/core/unix/src/TUnixSystem.cxx	2012-07-05 20:29:29.969242837 +0200
 @@ -98,6 +98,7 @@
  #include <pwd.h>
  #include <grp.h>
diff --git a/root.spec b/root.spec
index f11b43d..ea9bdfd 100644
--- a/root.spec
+++ b/root.spec
@@ -28,7 +28,7 @@
 Name:		root
 Version:	5.34.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2316,6 +2316,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Thu Jul 05 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.34.00-2
+- Do the glibc 2.16 patch properly
+
 * Sat Jun 09 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.34.00-1
 - Update to 5.34.00
 - New sub-package: root-io-gfal