[root/f16] Rebuild for xrootd 3.1.1

[Mattias Ellert]

commit 782c9c4d89d741220736371ee648d471c80439a8
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sat Mar 17 19:23:08 2012 +0100

    Rebuild for xrootd 3.1.1

 root-html.C       |    2 +-
 root-meta.patch   |   44 ++++++++++++++++++++++++++++++++++++++++++++
 root-xrootd.patch |    3 ++-
 root.spec         |   13 +++++++++++--
 4 files changed, 58 insertions(+), 4 deletions(-)
---
diff --git a/root-html.C b/root-html.C
index 413a8d3..a481a24 100644
--- a/root-html.C
+++ b/root-html.C
@@ -10,9 +10,9 @@
   gInterpreter->AddIncludePath("@PWD@/cint/cint/include");
   gInterpreter->AddIncludePath("@PWD@/cint/cint/stl");
   gInterpreter->AddIncludePath("@PWD@/cint/cint/lib");
+  #include <RtypesCint.h>
   #include <iostream>
   #include <string>
-  #include <RtypesCint.h>
   #include <DllImport.h>
   gROOT->GetPluginManager()->LoadHandlersFromPluginDirs("");
   gROOT->GetPluginManager()->AddHandler("TVirtualPS","image",
diff --git a/root-meta.patch b/root-meta.patch
new file mode 100644
index 0000000..6395e3a
--- /dev/null
+++ b/root-meta.patch
@@ -0,0 +1,44 @@
+diff -ur root-5.32.00.orig/core/meta/src/TCint.cxx root-5.32.00/core/meta/src/TCint.cxx
+--- root-5.32.00.orig/core/meta/src/TCint.cxx	2011-12-02 12:41:50.000000000 +0100
++++ root-5.32.00/core/meta/src/TCint.cxx	2012-02-18 12:07:12.157520013 +0100
+@@ -320,23 +320,27 @@
+    ProcessLine("#define ROOT_TError 0");
+    ProcessLine("#define ROOT_TGenericClassInfo 0");   
+ 
+-   TString include;
+-   // Add the root include directory to list searched by default
++   Int_t includes = gEnv->GetValue("Cint.Includes", 1);
++   if (includes > 0) {
++      TString include;
++      // Add the root include directory to list searched by default
+ #ifndef ROOTINCDIR
+-   include = gSystem->Getenv("ROOTSYS");
+-   include.Append("/include");
++      include = gSystem->Getenv("ROOTSYS");
++      include.Append("/include");
+ #else
+-   include = ROOTINCDIR;
++      include = ROOTINCDIR;
+ #endif
+-  TCint::AddIncludePath(include);
++      TCint::AddIncludePath(include);
+ 
+-   // Allow the usage of ClassDef and ClassImp in interpreted macros
+-   // if RtypesCint.h can be found (think of static executable without include/)
+-  char* whichTypesCint = gSystem->Which(include, "RtypesCint.h");
+-  if (whichTypesCint) {
+-      ProcessLine("#include <RtypesCint.h>");
+-      delete[] whichTypesCint;
+-  }
++      // Allow the usage of ClassDef and ClassImp in interpreted macros
++      // if RtypesCint.h can be found (think of static executable without
++      // include/)
++      char* whichTypesCint = gSystem->Which(include, "RtypesCint.h");
++      if (whichTypesCint) {
++         ProcessLine("#include <RtypesCint.h>");
++         delete[] whichTypesCint;
++      }
++   }
+ 
+ }
+ 
diff --git a/root-xrootd.patch b/root-xrootd.patch
index 51d4ab4..dc00b6e 100644
--- a/root-xrootd.patch
+++ b/root-xrootd.patch
@@ -1,7 +1,7 @@
 diff -ur root-5.30.04.orig/configure root-5.30.04/configure
 --- root-5.30.04.orig/configure	2011-11-08 14:28:55.000000000 +0100
 +++ root-5.30.04/configure	2011-11-16 05:48:21.224144395 +0100
-@@ -4424,13 +4424,14 @@
+@@ -4424,13 +4424,15 @@
      if test "x$externalxrd" = "xyes"; then
         buildxrd="no"
         # Check if bonjour is available for code potentially using it ...
@@ -20,6 +20,7 @@ diff -ur root-5.30.04.orig/configure root-5.30.04/configure
 +       ##      bonjourcppflags=
 +       ##   fi
 +       ##fi
++       bonjourcppflags=
      fi
  else
      buildxrd="no"
diff --git a/root.spec b/root.spec
index 07e8df1..35271e2 100644
--- a/root.spec
+++ b/root.spec
@@ -20,7 +20,7 @@
 Name:		root
 Version:	5.30.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -47,8 +47,11 @@ Patch0:		%{name}-ftgl.patch
 Patch1:		%{name}-fontconfig.patch
 #		Use system unuran:
 Patch2:		%{name}-unuran.patch
-#		Workaround for broken Form() on ppc
+#		Fixes for xrootd bonjour
 Patch3:		%{name}-xrootd.patch
+#		Fix hardcoded include path
+#		https://savannah.cern.ch/bugs/index.php?91463
+Patch4:		%{name}-meta.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #		The build segfaults on ppc64 during an invocation of cint:
 #		https://savannah.cern.ch/bugs/index.php?70542
@@ -118,6 +121,7 @@ BuildRequires:	graphviz-devel
 %if "%{?rhel}" == "5"
 BuildRequires:	graphviz-gd
 %endif
+BuildRequires:	expat-devel
 %if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
 BuildRequires:	font(liberationsans)
 BuildRequires:	font(liberationserif)
@@ -1023,6 +1027,7 @@ fi
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 find . '(' -name '*.cxx' -o -name '*.cpp' -o -name '*.C' -o -name '*.c' -o \
 	   -name '*.h' -o -name '*.hh' -o -name '*.hi' -o -name '*.py' -o \
@@ -1378,6 +1383,7 @@ echo %{_libdir}/%{name} > \
 
 # Generate documentation
 echo Rint.Includes: 0 > .rootrc
+echo Cint.Includes: 0 >> .rootrc
 echo Root.StacktraceScript: ${PWD}/etc/gdb-backtrace.sh >> .rootrc
 echo Gui.MimeTypeFile: ${PWD}/etc/root.mimes >> .rootrc
 sed "s!@PWD@!${PWD}!g" %{SOURCE2} > html.C
@@ -2284,6 +2290,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Sat Mar 17 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.30.06-2
+- Rebuild for xrootd 3.1.1
+
 * Mon Feb 13 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.30.06-1
 - Update to 5.30.06