[root/f17] Rebuild for xrootd 3.1.1

[Mattias Ellert]

commit 0bed893234065bfddc9122e2c8475bc3e1cad50d
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sat Mar 17 15:43:52 2012 +0100

    Rebuild for xrootd 3.1.1

 root-xrootd.patch |   48 +++++++++++++++++-------------------------------
 root.spec         |    5 ++++-
 2 files changed, 21 insertions(+), 32 deletions(-)
---
diff --git a/root-xrootd.patch b/root-xrootd.patch
index 6352682..9f7c113 100644
--- a/root-xrootd.patch
+++ b/root-xrootd.patch
@@ -1,36 +1,22 @@
---- root-5.32.00.orig/configure	2011-12-02 12:42:22.000000000 +0100
-+++ root-5.32.00/configure	2012-02-11 20:15:07.910877372 +0100
-@@ -4463,18 +4463,22 @@
-          fi
-       fi
-    done
-+   xrdlibdir=$tmpxrdlibdir
- 
--   #
--   # Check if bonjour is available for code potentially using it ...
--   if test "x$enable_xrootd" = "xyes"; then
--      xrdlibdir="$tmpxrdlibdir"
--      if test "x$enable_bonjour" = "xyes"; then
+diff -ur root-5.32.01.orig/configure root-5.32.01/configure
+--- root-5.32.01.orig/configure	2012-02-29 16:46:41.000000000 +0100
++++ root-5.32.01/configure	2012-03-17 14:14:02.822111495 +0100
+@@ -4486,10 +4486,14 @@
+    if test "x$enable_xrootd" = "xyes"; then
+       xrdlibdir="$tmpxrdlibdir"
+       if test "x$enable_bonjour" = "xyes"; then
 -         check_symbol XrdOucBonjour "$libxrdoucbjr" "$xrdlibdir"
 -         if test  $found_symbol -eq 0 ; then
 -            bonjourcppflags=
 -         fi
--      fi
--   fi
-+   # This check is broken. The xrootd libraries are C++ hence their
-+   # symbol names are mangled. The check_symbol macro is designed
-+   # to check for unmangled symbol names in C libraries.
-+   # #
-+   # # Check if bonjour is available for code potentially using it ...
-+   # if test "x$enable_xrootd" = "xyes"; then
-+   #    xrdlibdir="$tmpxrdlibdir"
-+   #    if test "x$enable_bonjour" = "xyes"; then
-+   #       check_symbol XrdOucBonjour "$libxrdoucbjr" "$xrdlibdir"
-+   #       if test  $found_symbol -eq 0 ; then
-+   #          bonjourcppflags=
-+   #      fi
-+   #    fi
-+   # fi
++         # This check is broken. The xrootd libraries are C++ hence their
++         # symbol names are mangled. The check_symbol macro is designed
++         # to check for unmangled symbol names in C libraries.
++         # check_symbol XrdOucBonjour "$libxrdoucbjr" "$xrdlibdir"
++         # if test  $found_symbol -eq 0 ; then
++         #    bonjourcppflags=
++         # fi
++         bonjourcppflags=
+       fi
+    fi
  fi
- 
- check_explicit "$enable_xrootd" "$enable_xrootd_explicit" \
diff --git a/root.spec b/root.spec
index 0cb05e4..1b54ff0 100644
--- a/root.spec
+++ b/root.spec
@@ -28,7 +28,7 @@
 Name:		root
 Version:	5.32.01
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -2295,6 +2295,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Sat Mar 17 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.32.01-2
+- Rebuild for xrootd 3.1.1
+
 * Sat Mar 03 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.32.01-1
 - Update to 5.32.01
 - Drop patches fixed upstream